Made tests more flexible.