Added remaining fields to controller.
Refactored tests to allow for XML escaping.