Modified Test and Example.