Adjusted operations and now all tests are passing