sap.ui.define(function () {
	"use strict";

	return {
		name : "TestSuite for sap.ui.core: GTP testcase CORE/ODATA/TYPES",
		defaults : {
			group : "OData Types",
			qunit : {
				version : "edge"
			},
			sinon : {
				version : "edge"
			},
			ui5 : {
				language : "en-US",
				rtl : false,
				"xx-waitForTheme" : true
			},
			coverage : {
				only : "[sap/ui/model/odata/type]",
				branchTracking : true
			}
		},
		tests : {
			"Boolean" : {},
			"Currency" : {},
			"Date" : {},
			"DateTimeBase" : {},
			"Decimal" : {},
			"Double" : {},
			"Guid" : {},
			"Int" : {},
			"Int64" : {},
			"ODataType" : {},
			"Raw" : {},
			"Single" : {},
			"Stream" : {},
			"String" : {},
			"Time" : {},
			"TimeOfDay" : {},
			"Unit" : {},
			"UnitMixin" : {}
		}
	};
});

@@ -113,19 +113,72 @@
 TA/TYPES
+ and%22%0A%09%09%09+ %22 'Currency and unit amount in two fields'
 %22,%0A
-
 %09%09defaul
@@ -481,16 +481,235 @@
 sts : %7B%0A
+%09%09%09// *************************************************************************%0A%09%09%09// Tests for sap.ui.core: GTP testcase CORE/ODATA/TYPES%0A%09%09%09// *************************************************************************%0A
 %09%09%09%22Bool
@@ -999,32 +999,32 @@
 %09%09%09%22Unit%22 : %7B%7D,%0A
-
 %09%09%09%22UnitMixin%22 :
@@ -1026,16 +1026,698 @@
 in%22 : %7B%7D
+,%0A%0A%09%09%09// *************************************************************************%0A%09%09%09// OPA Test for 'Currency and unit amount in two fields'%0A%09%09%09// *************************************************************************%0A%09%09%09%22OPA.TwoFields%22 : %7B%0A%09%09%09%09autostart : false,%0A%09%09%09%09loader : %7B%0A%09%09%09%09%09paths : %7B%0A%09%09%09%09%09%09%22sap/ui/core/sample%22 : %22test-resources/sap/ui/core/demokit/sample%22,%0A%09%09%09%09%09%09%22sap/ui/core/internal/samples%22 :%0A%09%09%09%09%09%09%09%22test-resources/sap/ui/core/internal/samples%22%0A%09%09%09%09%09%7D%0A%09%09%09%09%7D,%0A%09%09%09%09module : %5B%22test-resources/sap/ui/core/internal/samples/odata/twoFields/Opa.qunit%22%5D,%0A%09%09%09%09title : %22OPA test sap.ui.core.internal.samples.odata.twoFields%22,%0A%09%09%09%09ui5 : %7B%0A%09%09%09%09%09language : %22en-US%22%0A%09%09%09%09%7D%0A%09%09%09%7D
 %0A%09%09%7D%0A%09%7D;

Add OPA test to voter