Added fixtures util, fixed up broken tests