Add nextRound exception
Fix tests and add one more test
Fix style