Remove q-test overrides after AMI updates.
/cc @strichte @jmaurer @elmsheus @nstyles @fwinkl @npetters @jmasik @christos @mhodgkin