added support for claims operations
improved common test operations