fixed tests, all passing