src: more updates to similarity tests after working out some bugs.