Same fixes applied to unit test code signing