Cuke tests modified as much as possible without Jeff and Andy. Fixing tests should be a matter of fixing nil UID problem and minor tweaks.