Made tests more DRY