Non-greedy test without solution
Remove duplication
Merge branch 'non-greedy-solution'