I've updated the tests according to your comments!