Sorted one stubbing issue, others still to sort