3 test classes left before things should be able to run, restored some
files.