#28 #11 Restructured describe blocks slightly so that we can reuse the before / after setup