fixed tests -- i think