Add a more flexible output checker