refactored tests
refactoring
enum