Removed unused annotation
Added new tests