Add test, fixtures and more validations