modify some tests to work with mysql 5.6