Made tests more portable