Removed not needed order argument; adapted UTs, these need some cleanup