more tests use cases fixed