Also a bit nicer now with failures
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>