Brings challenge6 tests and solutions back to life

Manual merge of challenge6 tests & implementation that exist in master branch
but which differ in many things after the refactorings in the
refactoring branch. Tests are working