Started working on some unit testing.