Reverting changes to test code per review with @kenperkins.