Update readme
Get rid of some dodgy old constructs in the unit tests