Work on the unit tests