Merged changes into git repo
This attempts to update teh tests to match the new calling convention.  It is probably not perfect.