Greg's edit of Test.