Do not fail in 'clean' when there are no items
Sort tests a bit