Merge "Fixing failing test + covarage improvement"