Fixed failing unit tests and removed debug info