Tests should now pass.  Fixed fixtures a bit.