SEC-2151: Fix tests
SEC-2151: AnnotationParameterNameDiscoverer support single annotated param

This makes sense since often times only a single argument is necessary in
the expression.