Change to WebApi to support new ID-format for employee
Refactor Domain-model

Timing issue in tests came to the surface, so fixing tests after refactoring.