especially now that we have a custom version of that code anyway. Moved
the test code to tests/