Implemented expiration events and added tests for those events