Revert tests to how they were and add comments...

  ... as to how to divide them.