colordiff is not required
Test fixes and cleaning
Issues #7: Added event deletion