fixing test failures, slight refactor of passthrough defaulting