Fix the optimize regex and adapt the tests to actually test classAnnotationOptimize
Merge pull request #308 from dawehner/bmaster

fix the optimize regex and adapt the tests to actually test classAnnotat...