Create test user

Cherry-pick two test fixes from #473 that may resolve MySQL 5.7 test failures identified in #550.