Fix broken tests

There were 3 tests that were not passing. These changes fixes those tests so that they pass.