fixed tests, again...