Fixes for mysql tests