Fix unit and feature tests.