Make test runner actually work, and better

Conflicts:
	run_tests.sh