Fixed tests
Added cucumber structure
Added // COVER for all places where it's missing in the code