Updated packages and refactored the api class packages.
Fixed some remaining invalid references in the metadata service test.  Added the assertEntity method for the base data service implementation.