repair tests
repair tests

- use filepath.Join more idiomatically
- close some open channels before removing their associated output files

Signed-off-by: Nick Wei <397a225b6adb51a440bd3821475520403c3e9564@pivotal.io>

fujitsu-cf/cli,fujitsu-cf/cli,fujitsu-cf/cli