Removed all console logging from services. Added tests. Issue: #370