added more tests, changed unique signature