Fixed class parsing test
Fixed all tests