new structure for signature and fixed tests.