Refactors employee model and tests