Added in the remainder of loader tests.