First working version of a test. Anno modified to support test annotations.
Test + anno fixes.