Switching more matchers to should matchers. Fixing inser tests.