skips failing tests and fixes applicable tests