Correct incorrect expects and init race condition
Merge pull request #405 from hunner/fix_specs

Correct incorrect expects and init race condition