fixed tests and code