WIP on test validations