Merge pull request #13256 from timvandermeij/unit-test-async-await-pt4

Convert done callbacks to async/await in the last two unit test files

Author: timvandermeij