[#67] tests refactored, generating refactored