Some final fixes for combining test page