refactor test runner, resource types