Another ordering problem/optimization
Adding test case for edit existing entries