Add some methods and tests to service layer