Fix for issue #67
Merge branch 'master' into extract_tests
Extract tests to filter items that can't be unified with equality.