Filling out more unit tests.