fixed tests (again...)