A few tweaks to help with testing Celluloid code