Fixed references to old testing variables