Made test defining more flexible.