Test cleanup, make Stabilizer use Ferret where approriate