fixed tests for new classes names