Refactored Cow and tests; fixed UfoSpec error