fixed tests to pass.