Test files regorganistion to allow for better code coverage reporting.

In some cases we cant use depedency injection, and this results in false code coverage reports.