Add attribute collectionName.
Update tests using Await.result and various cleanup.