Fixing some fixture laziness