Moving test stuff next to what it's testing