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