modified the tests accordingly