Tests are running \o/ + sorting should be better