Make unit test code ready for SIG