Removing erroneous debug
Fixing tests to sort the output before comparing
Merge branch 'master' into develop