Add list sorting
Migration for sorting
Clean up some test issues