Added extra tests