Fix a couple bugs with test suite
Fixes to somewhat deprecated 'run' script
Merge branch 'master' of github.com:waterfield/redeye