Merge "Handle tests which fail with no methods compiled"