2 tests failing, removed debug code