Cleaning code. No real change.
Updating test to wait for header to load new location.