Error handling when manual annotation lookup fails
Additional test data
Move test setup to base class
Support for manual annotations