Setup cleanup

An opinionated cleanup / slight re-factor to make your tests easier.