fixed tests that the recent changes broke