Modify some test suite stuff