update units tests and remove annotations