Stablized tests so that they don't run as fast as they can any more
Added source varible back into the ferret lib
merged