Made tests more explicit