Adjusted the tests