Made tests more generic.