Made test runner lovely; added options to run it's own local tests without interference.