minimising references
renaming project, tidy up code slightly
modifying a few tests to be more robust to silent failure