added tests for concrete annotations
concrete annotations, closes #18
Merge branch 'concrete' into develop