diff --git a/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/chooseFormulaModelAt..st b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/chooseFormulaModelAt..st
new file mode 100644
index 0000000..1f9a9dd
--- /dev/null
+++ b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/chooseFormulaModelAt..st
@@ -0,0 +1,9 @@
+tools
+chooseFormulaModelAt: aPoint
+
+	| button |
+	button := self findModelButtonAt: aPoint.
+	self
+		should: [button click]
+		notify: 'model'
+		thenAnswer: SSCellModel asString.
\ No newline at end of file
diff --git a/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/findFormulaButtonAt..st b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/findFormulaButtonAt..st
new file mode 100644
index 0000000..64ebd10
--- /dev/null
+++ b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/findFormulaButtonAt..st
@@ -0,0 +1,4 @@
+tools
+findFormulaButtonAt: aPoint
+
+	^ self findButtonAt: aPoint byLabel: 'model'
\ No newline at end of file
diff --git a/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testChangeModelButtonExists.st b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testChangeModelButtonExists.st
index a3fa93d..1eecedb 100644
--- a/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testChangeModelButtonExists.st
+++ b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testChangeModelButtonExists.st
@@ -2,5 +2,5 @@ testing
 testChangeModelButtonExists
 
 	| button |
-	button := self findButtonAt: self someCellIndex byLabel: 'model'.
+	button := self findModelButtonAt: self someCellIndex.
 	self assert: button morphs hasSingle.
\ No newline at end of file
diff --git a/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testFormulaButtonExists.st b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testFormulaButtonExists.st
index e09611b..4c0b54e 100644
--- a/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testFormulaButtonExists.st
+++ b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testFormulaButtonExists.st
@@ -2,5 +2,5 @@ testing
 testFormulaButtonExists
 
 	| button |
-	button := self findButtonAt: self someCellIndex byLabel: 'formula'.
+	button := self findFormulaButtonAt: self someCellIndex.
 	self assert: button morphs hasSingle.
\ No newline at end of file
diff --git a/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testFormulaModelHasNoFormulaButton.st b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testFormulaModelHasNoFormulaButton.st
new file mode 100644
index 0000000..d12748d
--- /dev/null
+++ b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/instance/testFormulaModelHasNoFormulaButton.st
@@ -0,0 +1,5 @@
+testing
+testFormulaModelHasNoFormulaButton
+
+	self chooseFormulaModelAt: self someCellIndex.
+	self assert: (self findFormulaButtonAt: self someCellIndex) isNegative.
\ No newline at end of file
diff --git a/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/methodProperties.json b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/methodProperties.json
index 377a448..ce369ee 100644
--- a/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/methodProperties.json
+++ b/packages/SpreadSheetTool-Tests.package/SSModelAcceptanceTest.class/methodProperties.json
@@ -3,15 +3,18 @@
 		"anObject" : "CT 7/9/2019 12:33",
 		"anObject:" : "CT 7/9/2019 12:34" },
 	"instance" : {
+		"chooseFormulaModelAt:" : "CT 7/15/2019 16:56",
 		"chooseInspectorModelAt:" : "CT 7/12/2019 20:39",
 		"chooseTextModelAt:" : "CT 7/13/2019 16:16",
+		"findFormulaButtonAt:" : "CT 7/15/2019 16:57",
 		"findModelButtonAt:" : "CT 7/12/2019 20:39",
 		"testChangeConfiguration" : "CT 7/12/2019 21:04",
 		"testChangeFormula" : "CT 7/11/2019 11:22",
 		"testChangeModel" : "CT 7/11/2019 21:36",
-		"testChangeModelButtonExists" : "CT 7/10/2019 00:34",
+		"testChangeModelButtonExists" : "CT 7/15/2019 16:58",
 		"testDefaultModel" : "CT 7/15/2019 13:34",
-		"testFormulaButtonExists" : "CT 7/10/2019 00:33",
+		"testFormulaButtonExists" : "CT 7/15/2019 16:58",
+		"testFormulaModelHasNoFormulaButton" : "CT 7/15/2019 16:57",
 		"testRecursiveToolWithMenuBar" : "CT 7/15/2019 11:54",
 		"testSteppingActivated:" : "CT 7/15/2019 13:24",
 		"testSteppingButtonExists" : "CT 7/15/2019 12:09",