Added new testing code