Temporarily fixed tests to pass