All the unit tests now work