Fix redefined methods.
Made all tests pass.