Fixed failing test, removed debug cruft