Code Coverage should now work properly.
All classes that use this have been changed.
As more helpers get added, more tests will get added