Fix sorting desc to asc.
Update tests using Await.result and various cleanup.