Switch to security version 3.1-SNAPSHOT
Update tests to use hamcrest matchers