Added the possibility to specify no sorting. Furthermore, a broken Unit test has been fixed