Cleaned up tests (and split into two, for clarity). Still failing, since no changes have been made to the main code.