Fixed failing tests. All tests are now passing!