Forgot to clean up test functions...
Merge branch 'master' into Contracts