Readd temporarily removed tests
Fix descending
All tests passing