Added more tests and made { data: { } } overridable.