fixed tests, still one fails