still working on use case 22 tests