Added some unit test classes