Fixing one randomly broken spec...
Fixed another intermittent spec faillure.
Fixing more specs to make them more robust...