Added output.xml mock, docbloc changes