Made some more adjustments to get the tests to pass.