Improve the tests, which makes it clearer which use scenario is actually been tested. Also add missing use cases.