Update Run; improve output message
Add tests