refactoring tests in Common-App-Api util