cleaned up packages, added more service unit tests