Worked on more unit tests.