Fixed the tests as per the comments