bugfixes in singleton, bugfixes in identity contract, more tests for identity contracts (one fails because of bug in next_primary)