Starting to add unit testing.