More [data-method] tests and fixups