Added tests for all classes