Adding annotations tests, Adding annotations router tests and fixes and other fixes