Fix comment, relax check.
Prep moving test code.
Move test code into separate file.