Extra debugging info.
Merge remote-tracking branch 'origin/develop' into develop
Cleaned up Tests. 
Added Xenon GridFTP tests.
Renamed fields.
Toyp.