Fixed the test as well