Try and fix the unit tests