Made tests more consistent