Generate instances field correctly in signatures

Also fiddles to test suite