Work in progress.
Modified services, unit tests.
Merge pull request #4 from MedicoreNL/feature/cleanup

Feature/cleanup