Clean up test, fix header contrib name