test rewrite, ready for release 2.12