Refactor round testing