Moved stuff around and made testrunner more specific