Mark failed tests as broken, small fixes