clean up tests and update annotation