Fixed a few tests and moved a comment to its proper place