Add missing entry for clean up to CHANGELOG.
Change custom matcher to use RSpec shortcuts.