remove q stuff from tests