FilterLanguage, MockAnnotatable fixes