fix up the worst of the tests
fix up the worst of the tests

there's still broken-ness in the unplanned failover sections, though.

bquorning/ar_mysql_flexmaster,gabetax/ar_mysql_flexmaster,osheroff/ar_mysql_flexmaster