Refactor tests: cleanup run steps