Removed empty event handlers, created tests