Added further tests