corrected load order so tests can pass