test run and refactor files