Bug 5947: refactored common-api tests