Make changes to tests suggested by John and Justin.