Changed Force all Loading to increase code coverage
Refactoring some tests to increase the code coverage