Bit of spec refactoring and start of upgrade bunny to 0.9.0.rc2