Reorder and add comments about the test()s