Added tests for Service. Added some constructors. Some minor bug fixes.