neatening up the unit tests