Clean up testsuite contents
Finish up the arrows tests