Added more testing code...