Optimised Test.xml

I optimised test.xml. There were some problems with the organisation in
the XML part of the framework which have been fixed to make sure the
framework suits our purposes.