added more testing code