cleaned up tests, adding custom validation and test for it