Added further tests
Fixed class name identifier