[Specs] Increase coverage
[Helper] Improve specs coverage