Fixing failing tests

The current repo has failing tests. This PR updates the tests to match what the code is currently doing, with the assumption that it is doing what we want and the tests were not kept in line.