Issue #19 : Service layer and test for it implemented