another round of default test predicate mess