Fix issue causing non-test classes from potoentially getting loaded twice.