Much updated tests, WIP.
Working annotation schema, WIP.