Fixup tests to account for new fluent api