switch to annotation based tests