Progress on fixing test framework (AGAIN)

Uuuuuugh.