fixed a few things with initial unit testing.