tighten up some code; allow annotations on super-class of test file