lock celluloid version to avoid crashes
fix specs to use built in rspec spying
use yield instead of explicit block