Revised ResourceDataProvider.cs and TestPage