Fixed up tests due to refactor
Loader tests completed.