Fixed/refactored all the specs