Split engines_test out, pull core_test bits into testlib.
More test refactoring
Merge branch 'master' of github.com:dw/acid