Fix the failing specs

These were assuming @columns were being evaluated once it was set