More work on Angular multi-annotation popup
Fix tests
More tooling around with AJS