Fix unit tests on windows + slight improvement to signature formatting