Cleans up several specs that have been refactored previously