Missing coverage, better output handling