Enhanced the tests