Fix failing tests and reset tournament