refactored tests, models, validators
removed backup