Move the validator test to the correct namespace; cleanup.