REFACTOR

Komplettering refactor mocking tests