Test Fixes - Add author

Pushed to upstream cc/ @jmnavarro