fixed tests (again!)