Fixed tests (data changed, and wrong expected/retrieved order)