Restore the original tests and improved the test support for future work