Complete test coverage

[PamelaM]

There are still a few lines not covered by tests. Since the last test that was added to cover what seemed like an unimportant line ended up finding a bug, it's probably a good idea to nail all of them down.