Fix up the type to know about the new arguments
More tests, needs more fixture data