Add tests and outputs