Add final round and made every test valid