Removed annotations
Update unit tests