fixed tests to pass