Added further testing code