DON'T PUSH BEFORE PULLING AND REBASING!

* make old tests run in any order
* merge old tests into new test subs

* more copyright years?