Modified code per Gilbert's test spec