Restored test that was deleted by mistake, deleted some leaked debug code
Fixed conflicts