Some changes to Test result schema to allow customization