fixed tests, cleanup