Additional Unit tests, removed debug output