Test. Annotation tool fixes plus changes to better support the test.