ApiDoc annotation update. Updated formatter and added tests.