cleanup and added test to make sure class-level annotation behaves as
expected on "escaped" fields