removing tests codes and changing combinator to export correct signature