Fixes for missing test and breaking out winner checks