Fix tests to not ignore ordering and also assert all data is present