Added some test classes