updating tests so they pass
Merge branch 'upstream'