removing duplicate tests, adding back testrunner.