Reconciled existing tests with those that would be generated.

Queries being discussed  at exercism#377

Author: bencoman

dev/src/Exercise@TwoFer/TwoFerTest.class.st

@@ -75,17 +75,17 @@ TwoFerTest >> setUp [
 ]
 
 { #category : #tests }
-TwoFerTest >> testANameGiven [
+TwoFerTest >> test01_ANameGiven [
 	self assert: (twoFer who: 'Alice') equals: 'One for Alice, one for me.'
 ]
 
 { #category : #tests }
-TwoFerTest >> testAnotherNameGiven [
+TwoFerTest >> test02_AnotherNameGiven [
 	self assert: (twoFer who: 'Bob') equals: 'One for Bob, one for me.' 
 ]
 
 { #category : #tests }
-TwoFerTest >> testNoNameGiven [
+TwoFerTest >> test03_NoNameGiven [
 	self assert: twoFer who equals: 'One for you, one for me.' 
 
 ]

dev/src/ExercismDev/ExercismLabeledTest.class.st

@@ -28,6 +28,11 @@ ExercismLabeledTest >> description: aString [
 	description := aString
 ]
 
+{ #category : #'as yet unclassified' }
+ExercismLabeledTest >> exercise [
+	^ exercise
+]
+
 { #category : #'as yet unclassified' }
 ExercismLabeledTest >> exercise: aString [
 	exercise := aString
@@ -79,8 +84,7 @@ ExercismLabeledTest >> methodNameSegment [
 	methodNameSegment := groupPath isEmpty
 		ifFalse: [ groupPath last key asCamelCase asValidKeyword ]
 		ifTrue: [ '' ].
-		
-	^ methodNameSegment , description asCamelCase asValidKeyword 
+	^ (methodNameSegment , description asCamelCase asValidKeyword) withoutPrefix: 'and'
 ]
 
 { #category : #'as yet unclassified' }

dev/src/ExercismDev/String.extension.st

@@ -20,6 +20,6 @@ String >> asValidKeyword [
 	validName := validName select: [ :c | c isAlphaNumeric or: [ c == $_ ] ].
 
 	^(validName first isDigit 
-		ifTrue: [ (self isAllDigits ifTrue: ['at' ] ifFalse: ['and']) , validName ]
+		ifTrue: [ (self isAllDigits ifTrue: ['At' ] ifFalse: ['and']) , validName ]
 		ifFalse: [ validName ]) asSymbol
 ]