Fixing test helpers