'fixed' the unit tests