added tests for use cases 21-23