Tests updated + output patch implemented