Fixed broken tests (think these are actually obsolete).