Test fix :) Gr8 job writing the tests