A few more touch ups on the unit tests