Some minor test specs refacting