Touching up the unit tests