Updated the tests with the recommended changes