Changes to challenges test
Fixed to merge conflict