Made Tests Pass

Changed a bunch of stuff to make tests past. mainly XML