more regression tests
Merge branch 'master' of github.com:fredfeng/ScubaTest