Moved around a chunk of tests

... with the goal of making the tests more navigable, and reusing common entities throughout the tests.  I've created an entities package for reusable entities, and consolidated a number of tests (removing duplication where necessary, and renaming for clarity), mostly moving stuff into a more centralised area (away from individual issue numbering).