Added a few cool tests for new services plus polishing refactoring.