Tweaking signing process in preparation for tests