Added proper assertions for remaining service methods, updated unit tests.