Added tests for some classes