Fix and/or disable last failing tests