Fix the tests and unseparate comments from code

See the comments on the previous few commits on GitHub.