QPID-4027 Made modifications to reflect the changes made to interfaces. Fixed bugs identified in testing.