Tidy up the unit tests a bit
Start of work on assertions
More assertions
Tidied up the assertions to be better coded