fixing the unit tests to do the right thing