Skeleton code for tests
Coverage boosting
Rewritten mock to work