Refactor Test Running