Added output override
New tests