different use case test implementations and code fix