rspec test improvements

## motivation

One test was flickering and another was calling a deprecated rspec-mock API.

## tests

```
$ be rake spec
Finished in 5 minutes 42 seconds (files took 0.3254 seconds to load)
48 examples, 0 failures
```