Minor changes
Added output test