Made Service task.
Refactored testing tasks. Changed use of assertEquals and the like to assertThat.