Add a bunch of test scripts
Fix after last batch of commits to properly merge changes into the branch
Merge branch 'master' of github.com:yaneurabeya/scratch