Re-enable CustomMatchersSpec and update for current version of custom matchers