cleanup validate logic in tests

cc @lancejpollard