Make tests on Gonzales more atomic