Add -F option to run-tests and adjust output colour

Review 946 by @tryneus