Add validations, fix tests/test-data and clean-up