Normalize differences between client & server & add data injection for testing