Make tests less flaky by adding promises and waits where async calls are made. Fix VK controller.