Couple of extra tests added