bug, fixed tests.