Accommodated for mode=xml all around for all app classes + minor related fixes + all tests passing --> Failures:[]