Added tests for service, moved MMS code
Extracted formatter
More tests