Add tests, change output in foiled attempts to intercept stdin/out for testing