Major re-org to help with the next tests.
Merge branch 'master' of https://github.com/roydude/owd_smoketests