Fix test calss generation