Worked on some unit tests.