Revert to Twill unit tests