Moar tests, and found a wobbly bit while writing
Changes to tests layout, added --cover-inclusive to run-tests script, and added some fixtures