Remove notification models
Fix some broken tests