Added unit tests for some classes