Done Service Author and Tests, adapting PSR-2.