expanded output options
removed test-file