Major refactoring [AMECHE-327]
Preparing test case mock-ups [AMECHE-327]