Revert unit tests to rewire