fixed typo in geneateTests
fixed tests for new classes names