Made tests more abstract