Removed debug line & more test code