Added heavyweight unit tests and updates to service DB