Tests: Revert tests that break on mysql (sigh)