Revert "Try to undo all the quicktests changes"

This reverts commit d8c19f15ab4005259d1d27c01645e0510eec130f.