Get testing slightly closer to working