Merge test & support.html update