Fixed method annotations
Added test