Fixing some spec failures caused by some refactoring
Version bump