Addressed more intermittently failing specs.