Adding multiple output options with tests