Made some more fixes to make_test.py