Correct incorrect expects and init race condition