Updating the mapped list sorting tests to include swap checks etc.