All but eliminate @version on Formula
Clean up some things in test_bucket