Extended wait times on async unit tests to 5 seconds
Merge branch 'master' into dev-master