Adding extra tests