Unit tests for the annotations support and improved performance.