Sort results in test to get consistent results every time
Move validators to their own file
Put all the validators in their own namespace so they don't class with others