Added tests for each class