General: (KN) Fixed code breaking unit tests and removed unnecessary debugging messages.