Merge branch 'maint'

* maint: (128 commits)
  beam_lib: Correct wrong type specification
  testSeqOf: Test constrained, extensible sizes
  [snmp/agent] Some restructuring of test suite
  Clean up testSeqOf
  Extend tests cases for BIT STRING
  Improve tests of ENUMERATED
  asn1ct_check: Eliminate useless Per argument from complist_as_tuple()
  asn1ct_check: Don't pass on #'ObjectClassFieldType'{} with fixed type
  asn1ct_gen_per: Remove useless renewal of 'enumval'
  Fix encoding of semi-constrained, extensible INTEGERs
  PER/UPER: Fix decoding of semi-constrained INTEGERs
  testPrim: Simplify test cases using a roundtrip function
  BER: Fix handling of a constructed default value for a class
  PER: Generate code for deep table constraints at compile-time
  Normalize data representation for table constraints
  asn1ct: Simplify check_value/2
  Extend tests to cover more code in asn1ct_check
  Clean up checking of values for ENUMERATEDs
  Introduce a new mechanism for structured error handling
  asn1_db: Make dbput/3 and dbsave/2 asynchronous
  ...

48 files changed, 974 insertions, 3013 deletions

diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 6e6ab4639c..15b97df972 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -114,7 +114,8 @@ MODULES= \
 	asn1_app_test \
 	asn1_appup_test \
 	asn1_wrapper \
-	asn1_SUITE
+	asn1_SUITE \
+	error_SUITE
 
 SUITE= asn1_SUITE.erl
 
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 8deabece37..6be493320c 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -139,7 +139,6 @@ groups() ->
        testSetOfCho,
        testEnumExt,
        value_test,
-       value_bad_enum_test,
        testSeq2738,
        % Uses 'Constructed'
        {group, [], [constructed,
@@ -177,6 +176,7 @@ groups() ->
                     testX420]},
        testTcapsystem,
        testNBAPsystem,
+       testS1AP,
        test_compile_options,
        testDoubleEllipses,
        test_x691,
@@ -655,7 +655,6 @@ constraint_equivalence(Config) ->
     AbsFile = filename:join(CaseDir, Asn1Spec++".abs"),
     {ok,Terms} = file:consult(AbsFile),
     Cs = [begin
-	      'INTEGER' = element(3, Type),	%Assertion.
 	      Constraints = element(4, Type),
 	      Name1 = atom_to_list(Name0),
 	      {Name,_} = lists:splitwith(fun(C) -> C =/= $X end, Name1),
@@ -741,11 +740,6 @@ value_test(Config, Rule, Opts) ->
     {ok, _} = asn1ct:test('ObjIdValues', 'ObjIdType',
                           'ObjIdValues':'mobileDomainId'()).
 
-value_bad_enum_test(Config) ->
-    {error, _} = asn1ct:compile(?config(data_dir, Config) ++
-				    "BadEnumValue1",
-				[{outdir, ?config(case_dir, Config)}]).
-
 constructed(Config) ->
     test(Config, fun constructed/3, [ber]).
 constructed(Config, Rule, Opts) ->
@@ -860,7 +854,7 @@ testInvokeMod(Config, Rule, Opts) ->
     {ok, _Result2} = 'PrimStrings':encode('Bs1', [1, 0, 1, 0]).
 
 testExport(Config) ->
-    {error, {asn1, _Reason}} =
+    {error, _} =
 	asn1ct:compile(filename:join(?config(data_dir, Config),
 				     "IllegalExport"),
 		       [{outdir, ?config(case_dir, Config)}]).
@@ -906,8 +900,8 @@ testOpenTypeImplicitTag(Config, Rule, Opts) ->
 duplicate_tags(Config) ->
     DataDir = ?config(data_dir, Config),
     CaseDir = ?config(case_dir, Config),
-    {error, {asn1, [{error, {type, _, _, 'SeqOpt1Imp',
-			     {asn1, {duplicates_of_the_tags, _}}}}]}} =
+    {error, [{error, {type, _, _, 'SeqOpt1Imp',
+			     {asn1, {duplicates_of_the_tags, _}}}}]} =
 	asn1ct:compile(filename:join(DataDir, "SeqOptional2"),
 		       [abs, {outdir, CaseDir}]).
 
@@ -1024,6 +1018,16 @@ testNBAPsystem(Config, Rule, Opts) ->
     testNBAPsystem:compile(Config, [Rule|Opts]),
     testNBAPsystem:test(Rule, Config).
 
+testS1AP(Config) -> test(Config, fun testS1AP/3).
+testS1AP(Config, Rule, Opts) ->
+    S1AP = ["S1AP-CommonDataTypes",
+	    "S1AP-Constants",
+	    "S1AP-Containers",
+	    "S1AP-IEs",
+	    "S1AP-PDU-Contents",
+	    "S1AP-PDU-Descriptions"],
+    asn1_test_lib:compile_all(S1AP, Config, [Rule|Opts]).
+
 test_compile_options(Config) ->
     ok = test_compile_options:wrong_path(Config),
     ok = test_compile_options:path(Config),
@@ -1077,17 +1081,14 @@ ticket_6143(Config) ->
     ok = test_compile_options:ticket_6143(Config).
 
 testExtensionAdditionGroup(Config) ->
-    %% FIXME problems with automatic tags [ber_bin], [ber_bin, optimize]
-    test(Config, fun testExtensionAdditionGroup/3, [per, uper]).
+    test(Config, fun testExtensionAdditionGroup/3).
 testExtensionAdditionGroup(Config, Rule, Opts) ->
     asn1_test_lib:compile("Extension-Addition-Group", Config, [Rule|Opts]),
     asn1_test_lib:compile_erlang("extensionAdditionGroup", Config,
                                  [debug_info]),
-    extensionAdditionGroup:run([Rule|Opts]),
-    extensionAdditionGroup:run2([Rule|Opts]),
-    extensionAdditionGroup:run3(),
-    asn1_test_lib:compile("EUTRA-RRC-Definitions", Config, [Rule, {record_name_prefix, "RRC-"}|Opts]),
-    extensionAdditionGroup:run3([Rule|Opts]).
+    asn1_test_lib:compile("EUTRA-RRC-Definitions", Config,
+			  [Rule,{record_name_prefix,"RRC-"}|Opts]),
+    extensionAdditionGroup:run(Rule).
 
 % parse_modules() ->
 %   ["ImportsFrom"].
@@ -1097,11 +1098,8 @@ per_modules() ->
 
 ber_modules() ->
     [X || X <- test_modules(),
-          X =/= "CommonDataTypes",
-          X =/= "DS-EquipmentUser-CommonFunctionOrig-TransmissionPath",
           X =/= "H323-MESSAGES",
-          X =/= "H235-SECURITY-MESSAGES",
-          X =/= "MULTIMEDIA-SYSTEM-CONTROL"].
+          X =/= "H235-SECURITY-MESSAGES"].
 
 test_modules() ->
     ["BitStr",
diff --git a/lib/asn1/test/asn1_SUITE_data/BadEnumValue1.asn b/lib/asn1/test/asn1_SUITE_data/BadEnumValue1.asn
deleted file mode 100644
index dbc224a74b..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/BadEnumValue1.asn
+++ /dev/null
@@ -1,8 +0,0 @@
-BadEnumValue1 DEFINITIONS AUTOMATIC TAGS ::=
-
-BEGIN
-
-E3 ::= ENUMERATED {monday,thuesday(0)}
-enumWrongVal E3 ::= sunday
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/Certificate.asn b/lib/asn1/test/asn1_SUITE_data/Certificate.asn
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Certificate.asn
+++ /dev/null
diff --git a/lib/asn1/test/asn1_SUITE_data/ChoExtension.asn1 b/lib/asn1/test/asn1_SUITE_data/ChoExtension.asn1
index 18473bae30..f6fe18be10 100644
--- a/lib/asn1/test/asn1_SUITE_data/ChoExtension.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/ChoExtension.asn1
@@ -41,4 +41,10 @@ ChoExt4 ::= CHOICE
   str OCTET STRING
 }
 
+ChoEmptyRoot ::= CHOICE {
+  ...,
+  bool BOOLEAN,
+  int INTEGER (0..7)
+}
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1 b/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1
index 6a97c1b38e..8b3d151502 100644
--- a/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/ConstraintEquivalence.asn1
@@ -8,6 +8,9 @@ BEGIN
  SingleValueX5 ::= INTEGER ((42) INTERSECTION (MIN..MAX))
  SingleValueX6 ::= INTEGER ((42) INTERSECTION (40..49))
  SingleValueX7 ::= INTEGER (42..42)
+ SingleValueX8 ::= INTEGER (integer42)
+ SingleValueX9 ::= INTEGER (integer42..integer42)
+ SingleValueX10 ::= INTEGER ((integer42) INTERSECTION (40..49))
 
  UnconstrainedX0 ::= INTEGER
  UnconstrainedX1 ::= INTEGER (MIN..MAX)
@@ -24,6 +27,7 @@ BEGIN
  RangeX04 ::= INTEGER (5|6|7|8|9|10)
  RangeX05 ::= INTEGER (10|9|8|7|6|5)
  RangeX06 ::= INTEGER (5|6|7..10)
+ RangeX07 ::= INTEGER (integer4<..<integer11)
 
  RangeX10 ::= INTEGER ((5..6) UNION (7..8) UNION (9|10))
  RangeX11 ::= INTEGER ((5|6) UNION (7..8) UNION (9|10))
@@ -39,4 +43,20 @@ BEGIN
  RangeX23 ::= INTEGER ((0..10) INTERSECTION (5..20) ^ (MIN..MAX))
  RangeX24 ::= INTEGER ((5|6|7|8|9|10) INTERSECTION (5..20) ^ (MIN..MAX))
 
+ UnconstrainedStringX00 ::= IA5String
+ UnconstrainedStringX01 ::= IA5String (SIZE (0..MAX))
+
+ ConstrainedStringX00 ::= IA5String (SIZE (0..5))
+ ConstrainedStringX01 ::= IA5String (SIZE (0|1|2|3|4|5))
+
+ -- Note: None of the back-ends care about the exact values
+ -- outside of the root range.
+ ExtConstrainedStringX00 ::= IA5String (SIZE (1..2, ...))
+ ExtConstrainedStringX01 ::= IA5String (SIZE (1|2, ..., 3))
+ ExtConstrainedStringX02 ::= IA5String (SIZE (1|2, ..., 3|4|5))
+
+ integer4 INTEGER ::= 4
+ integer11 INTEGER ::= 11
+ integer42 INTEGER ::= 42
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/Constraints.py b/lib/asn1/test/asn1_SUITE_data/Constraints.py
index 87243121f7..e4bc987e4c 100644
--- a/lib/asn1/test/asn1_SUITE_data/Constraints.py
+++ b/lib/asn1/test/asn1_SUITE_data/Constraints.py
@@ -12,6 +12,12 @@ ContainedSubtype ::= INTEGER (INCLUDES Range10to20)
 -- Some ranges for additional constrained number testing.
 LongLong ::= INTEGER (0..18446744073709551615)
 Range256to65536 ::= INTEGER (256..65536)
+SemiConstrained ::= INTEGER (100..MAX)
+NegSemiConstrained ::= INTEGER (-128..MAX)
+SemiConstrainedExt ::= INTEGER (42..MAX, ...)
+NegSemiConstrainedExt ::= INTEGER (-128..MAX, ...)
+
+-- Other constraints
 FixedSize ::= OCTET STRING (SIZE(10)) 
 FixedSize2 ::= OCTET STRING (SIZE(10|20)) 
 VariableSize ::= OCTET STRING (SIZE(1..10)) 
@@ -86,5 +92,6 @@ Document ::= OCTET STRING (ENCODED BY pdf)
 
 pdf OBJECT IDENTIFIER ::= {1,2,3,4,5}
 
+ShorterExt ::= IA5String (SIZE (5, ...))
 
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/EUTRA-InterNodeDefinitions.asn b/lib/asn1/test/asn1_SUITE_data/EUTRA-InterNodeDefinitions.asn
deleted file mode 100644
index 5e6313dc02..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/EUTRA-InterNodeDefinitions.asn
+++ /dev/null
@@ -1,123 +0,0 @@
--- 3GPP TS 36.331 V8.8.0 (2009-12)
--- $Id$
---
-EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
- 
-BEGIN
-
-
-HandoverCommand ::=					SEQUENCE {
-	criticalExtensions					CHOICE {
-		c1									CHOICE{
-			handoverCommand-r8					HandoverCommand-r8-IEs,
-			spare7 NULL,
-			spare6 NULL, spare5 NULL, spare4 NULL,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-HandoverCommand-r8-IEs ::=			SEQUENCE {
-	handoverCommandMessage				OCTET STRING (CONTAINING DL-DCCH-Message),
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-
-HandoverPreparationInformation ::=	SEQUENCE {
-	criticalExtensions					CHOICE {
-		c1									CHOICE{
-			handoverPreparationInformation-r8	HandoverPreparationInformation-r8-IEs,
-			spare7 NULL,
-			spare6 NULL, spare5 NULL, spare4 NULL,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-HandoverPreparationInformation-r8-IEs ::= SEQUENCE {
-	ue-RadioAccessCapabilityInfo		UE-CapabilityRAT-ContainerList,
-	as-Config							AS-Config					OPTIONAL, 		-- Cond HO
-	rrm-Config							RRM-Config					OPTIONAL,
-	as-Context							AS-Context				OPTIONAL, 		-- Cond HO
-	nonCriticalExtension				SEQUENCE {}					OPTIONAL
-}
-
-
-UERadioAccessCapabilityInformation ::= SEQUENCE {
-	criticalExtensions					CHOICE {
-		c1									CHOICE{
-			ueRadioAccessCapabilityInformation-r8
-												UERadioAccessCapabilityInformation-r8-IEs,
-			spare7 NULL,
-			spare6 NULL, spare5 NULL, spare4 NULL,
-			spare3 NULL, spare2 NULL, spare1 NULL
-		},
-		criticalExtensionsFuture			SEQUENCE {}
-	}
-}
-
-UERadioAccessCapabilityInformation-r8-IEs ::= SEQUENCE {
-	ue-RadioAccessCapabilityInfo		OCTET STRING (CONTAINING UECapabilityInformation),
-	nonCriticalExtension				SEQUENCE {}							OPTIONAL
-}
-
-
-AS-Config ::=				SEQUENCE {
-	sourceMeasConfig					MeasConfig,
-	sourceRadioResourceConfig			RadioResourceConfigDedicated,
-	sourceSecurityAlgorithmConfig		SecurityAlgorithmConfig,
-	sourceUE-Identity					C-RNTI,
-	sourceMasterInformationBlock		MasterInformationBlock,
-	sourceSystemInformationBlockType1	SystemInformationBlockType1,
-	sourceSystemInformationBlockType2	SystemInformationBlockType2,
-	antennaInfoCommon					AntennaInfoCommon,
-	sourceDl-CarrierFreq                ARFCN-ValueEUTRA,
-	...
-}
-
-
-AS-Context ::=							SEQUENCE {
-	reestablishmentInfo						ReestablishmentInfo			OPTIONAL	-- Cond HO
-}
-
-
-ReestablishmentInfo ::=				SEQUENCE {
-	sourcePhysCellId					PhysCellId,
-	targetCellShortMAC-I				ShortMAC-I,
-	additionalReestabInfoList			AdditionalReestabInfoList				OPTIONAL,
-	...
-}
-
-AdditionalReestabInfoList ::=		SEQUENCE ( SIZE (1..maxReestabInfo) ) OF AdditionalReestabInfo
-
-AdditionalReestabInfo ::=	SEQUENCE{
-	cellIdentity						CellIdentity,
-	key-eNodeB-Star					Key-eNodeB-Star,
-	shortMAC-I							ShortMAC-I
-}
-
-Key-eNodeB-Star ::=					BIT STRING (SIZE (256))
-
-
-RRM-Config ::=				SEQUENCE {
-	ue-InactiveTime				ENUMERATED {
-									s1, s2, s3, s5, s7, s10, s15, s20,
-									s25, s30, s40, s50, min1, min1s20c, min1s40,
-									min2, min2s30, min3, min3s30, min4, min5, min6,
-									min7, min8, min9, min10, min12, min14, min17, min20,
-									min24, min28, min33, min38, min44, min50, hr1,
-									hr1min30, hr2, hr2min30, hr3, hr3min30, hr4, hr5, hr6,
-									hr8, hr10, hr13, hr16, hr20, day1, day1hr12, day2,
-									day2hr12, day3, day4, day5, day7, day10, day14, day19,
-									day24, day30, dayMoreThan30}		OPTIONAL,
-	...
-}
-
-
-maxReestabInfo				INTEGER ::= 32	-- Maximum number of KeNB* and shortMAC-I forwarded
-											-- at handover for re-establishment preparation
-
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/EUTRA-UE-Variables.asn b/lib/asn1/test/asn1_SUITE_data/EUTRA-UE-Variables.asn
deleted file mode 100644
index 414140a6fb..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/EUTRA-UE-Variables.asn
+++ /dev/null
@@ -1,49 +0,0 @@
--- 3GPP TS 36.331 V8.8.0 (2009-12)
--- $Id$
---
-EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
- 
-BEGIN
-
-
-VarMeasConfig ::=					SEQUENCE {
-	-- Measurement identities
-	measIdList							MeasIdToAddModList					OPTIONAL,
-	-- Measurement objects
-	measObjectList						MeasObjectToAddModList				OPTIONAL,
-	-- Reporting configurations
-	reportConfigList					ReportConfigToAddModList			OPTIONAL,
-	-- Other parameters
-	quantityConfig						QuantityConfig						OPTIONAL,
-	s-Measure							RSRP-Range							OPTIONAL,
-	speedStatePars						CHOICE {
-		release								NULL,
-		setup								SEQUENCE {
-			mobilityStateParameters				MobilityStateParameters,
-			timeToTrigger-SF					SpeedStateScaleFactors
-		}
-	}																		OPTIONAL
-}
-
-
-VarMeasReportList ::=				SEQUENCE (SIZE (1..maxMeasId)) OF VarMeasReport
-
-VarMeasReport ::=					SEQUENCE {
-	-- List of measurement that have been triggered
-	measId								MeasId,
-	cellsTriggeredList					CellsTriggeredList				OPTIONAL,
-	numberOfReportsSent					INTEGER
-}
-
-CellsTriggeredList ::=				SEQUENCE (SIZE (1..maxCellMeas)) OF PhysCellId
-
-
-VarShortMAC-Input ::=					SEQUENCE {
-	cellIdentity							CellIdentity,
-	physCellId								PhysCellId,
-	c-RNTI									C-RNTI
-}
-
-
-
-END
\ No newline at end of file
diff --git a/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1 b/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
index 9ad1f6299e..3a727e46bb 100644
--- a/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
@@ -1,28 +1,35 @@
-EnumExt DEFINITIONS AUTOMATIC TAGS ::=

-BEGIN

-

-Ext ::= ENUMERATED {

-	blue(0),

-	red(1),

-	green(2),

-	...

-}

-

-Ext1 ::= ENUMERATED {

-	blue(0),

-	red(1),

-	green(2),

-	...,

-	orange(7)

-}

-

-Noext ::= ENUMERATED {

-	blue(0),

-	red(1),

-	green(2)

-}

-

-Globalstate ::= ENUMERATED {def(1),com(2),preop(3),oper(4),noop(5),fail(6)}

-

-END

-

+EnumExt DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+
+Ext ::= ENUMERATED {
+	blue(0),
+	red(1),
+	green(2),
+	...
+}
+
+Ext1 ::= ENUMERATED {
+	blue(0),
+	red(1),
+	green(2),
+	...,
+	orange(7),
+        black(8),
+	magenta(9)
+}
+
+Noext ::= ENUMERATED {
+	blue(0),
+	red(1),
+	green(2)
+}
+
+Globalstate ::= ENUMERATED {def(1),com(2),preop(3),oper(4),noop(5),fail(6)}
+
+Seq ::= SEQUENCE {
+   e Ext1,
+   i INTEGER
+}
+
+END
+
diff --git a/lib/asn1/test/asn1_SUITE_data/InfObj.asn b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
index 0a437e12df..53e5043cb7 100644
--- a/lib/asn1/test/asn1_SUITE_data/InfObj.asn
+++ b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
@@ -39,21 +39,6 @@ RANAP-PDU ::= CHOICE {
 
 CLASS2 ::= RANAP-ELEMENTARY-PROCEDURE
 
-MY-CLASS ::= CLASS {
-    &integerValue      INTEGER UNIQUE,
-    &booleanValue      BOOLEAN,
-    &stringValue       PrintableString
-    }
-
-myobject MY-CLASS ::= {
-    &integerValue      12,
-    &booleanValue      TRUE,
-    &stringValue       "hejsan"
-    }
-MyObjectSet MY-CLASS ::= {
-    myobject
-    }
-
 InitiatingMessage  ::= SEQUENCE {
     procedureCode  RANAP-ELEMENTARY-PROCEDURE.&procedureCode	({RANAP-ELEMENTARY-PROCEDURES}),
     criticality	RANAP-ELEMENTARY-PROCEDURE.&criticality		({RANAP-ELEMENTARY-PROCEDURES}{@procedureCode}),
@@ -148,6 +133,83 @@ id-Iu-Release3				INTEGER ::= 3
 id-Iu-Release4				INTEGER ::= 4
 id-Iu-Release5				INTEGER ::= 5
 
+--
+-- MY-CLASS
+--
+
+Seq ::= SEQUENCE {
+    int INTEGER,
+    str OCTET STRING
+}
+
+MY-CLASS ::= CLASS {
+    &Count             DEFAULT INTEGER,
+    &integerValue      INTEGER UNIQUE,
+    &booleanValue      BOOLEAN,
+    &stringValue       PrintableString
+}
+
+myobject MY-CLASS ::= {
+    &integerValue      12,
+    &booleanValue      TRUE,
+    &stringValue       "hejsan"
+}
+
+myotherobject MY-CLASS ::= {
+    &Count             Seq,
+    &integerValue      42,
+    &booleanValue      FALSE,
+    &stringValue       "hoppsan"
+}
+
+MyObjectSet MY-CLASS ::= {
+    myobject | myotherobject |
+    {
+        -- Each character will be encoded in 3 bits in UPER, 4 bits in PER.
+	&Count             NumericString (FROM("01234567") ^ SIZE(8)),
+	&integerValue      43,
+	&booleanValue      TRUE,
+	&stringValue       "tjosan"
+    }
+}
+
+MyPdu ::= SEQUENCE {
+    count MY-CLASS.&Count ({MyObjectSet}{@int}),
+    int   MY-CLASS.&integerValue ({MyObjectSet}),
+    bool  MY-CLASS.&booleanValue ({MyObjectSet}{@int}),
+    str   MY-CLASS.&stringValue ({MyObjectSet}{@int})
+}
+
+Seq2 ::= SEQUENCE {
+   int MY-CLASS.&integerValue ({MyObjectSet}),
+   seqof SEQUENCE (1..10) OF MY-CLASS.&booleanValue ({MyObjectSet}{@int}),
+   setof SET (1..10) OF MY-CLASS.&booleanValue ({MyObjectSet}{@int})
+}
+
+--
+-- Class with constructed default
+--
+
+CONSTRUCTED-DEFAULT ::= CLASS {
+  &id INTEGER UNIQUE,
+  &Type DEFAULT SEQUENCE { a INTEGER, b BOOLEAN },
+  &ok BOOLEAN DEFAULT TRUE
+}
+
+constructed1 CONSTRUCTED-DEFAULT ::= { &id 1 }
+constructed2 CONSTRUCTED-DEFAULT ::= { &id 2, &ok false }
+
+ConstructedDefaultSet CONSTRUCTED-DEFAULT ::= {
+  constructed1 |
+  constructed2 |
+  { &id 3, &Type BOOLEAN }
+}
+
+ConstructedPdu ::= SEQUENCE {
+  id CONSTRUCTED-DEFAULT.&id ({ConstructedDefaultSet}),
+  content CONSTRUCTED-DEFAULT.&Type ({ConstructedDefaultSet}{@id})
+}
+
 END
 
 
diff --git a/lib/asn1/test/asn1_SUITE_data/InfObj2.asn b/lib/asn1/test/asn1_SUITE_data/InfObj2.asn
deleted file mode 100644
index faba7371a4..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/InfObj2.asn
+++ /dev/null
@@ -1,156 +0,0 @@
-InfObj2 DEFINITIONS ::=
-BEGIN
-
-
-RANAP-ELEMENTARY-PROCEDURE ::= CLASS {
-    &InitiatingMessage				,
-    &SuccessfulOutcome				OPTIONAL,
-    &Outcome				DEFAULT NULL,
-    &vartypvalue                        &Outcome,
-    &FixTypeValSet                      PrintableString,
-    &VarTypeValSet                      &InitiatingMessage,
-    &infoObject                         RANAP-ELEMENTARY-PROCEDURE,
-    &InfObjectSet                       CLASS2,
-    &UnsuccessfulOutcome				OPTIONAL,
-    &procedureCode			ProcedureCode 	UNIQUE,
-    &criticality			Criticality 	DEFAULT ignore
-}
-WITH SYNTAX {
-	INITIATING MESSAGE		&InitiatingMessage
-	[SUCCESSFUL OUTCOME		&SuccessfulOutcome]
-	[UNSUCCESSFUL OUTCOME		&UnsuccessfulOutcome]
-	[OUTCOME			&Outcome]
-	PROCEDURE CODE				&procedureCode
-	[CRITICALITY			&criticality]
-}
-
-RANAP-PDU ::= CHOICE {
-    initiatingMessage	[0] InitiatingMessage,
-    substrings          [1] SEQUENCE {
-	type           RANAP-ELEMENTARY-PROCEDURE.&procedureCode({RANAP-ELEMENTARY-PROCEDURES}),
-	strings        SEQUENCE OF CHOICE {
-	    initial [0] RANAP-ELEMENTARY-PROCEDURE.&Outcome({
-		RANAP-ELEMENTARY-PROCEDURES}{@substrings.type}),
-	    final [1] RANAP-ELEMENTARY-PROCEDURE.&Outcome({RANAP-ELEMENTARY-PROCEDURES}{@substrings.type})
-	    }
-	},
---	successfulOutcome	SuccessfulOutcome,
---	unsuccessfulOutcome	UnsuccessfulOutcome,
---	outcome			Outcome,
-    ...
-    }
-
-CLASS2 ::= RANAP-ELEMENTARY-PROCEDURE
-
-MY-CLASS ::= CLASS {
-    &integerValue      INTEGER UNIQUE,
-    &booleanValue      BOOLEAN,
-    &stringValue       PrintableString
-    }
-
-myobject MY-CLASS ::= {
-    &integerValue      12,
-    &booleanValue      TRUE,
-    &stringValue       "hejsan"
-    }
-MyObjectSet MY-CLASS ::= {
-    myobject
-    }
-
-InitiatingMessage  ::= SEQUENCE {
-    procedureCode  RANAP-ELEMENTARY-PROCEDURE.&procedureCode	({RANAP-ELEMENTARY-PROCEDURES}),
-    criticality	RANAP-ELEMENTARY-PROCEDURE.&criticality		({RANAP-ELEMENTARY-PROCEDURES}{@procedureCode}),
-    value	RANAP-ELEMENTARY-PROCEDURE.&InitiatingMessage	({RANAP-ELEMENTARY-PROCEDURES}{@procedureCode})
-    }
-
-iu-Release RANAP-ELEMENTARY-PROCEDURE ::= {
-    INITIATING MESSAGE	Iu-ReleaseCommand
-    SUCCESSFUL OUTCOME	Iu-ReleaseComplete
-    PROCEDURE CODE	id-Iu-Release1
-    CRITICALITY		ignore
-    }
-
-relocationPreparation RANAP-ELEMENTARY-PROCEDURE ::= {
-    INITIATING MESSAGE	INTEGER --Iu-ReleaseCommand
-    SUCCESSFUL OUTCOME	Iu-ReleaseComplete
-    PROCEDURE CODE	id-Iu-Release2
-    CRITICALITY		notify
-    }
-
-object3 RANAP-ELEMENTARY-PROCEDURE ::= {
-    &InitiatingMessage Iu-ReleaseCommand,
-    &SuccessfulOutcome Iu-ReleaseComplete,
-    &procedureCode     id-Iu-Release3,
-    &criticality       reject
-    }
-
-object4 RANAP-ELEMENTARY-PROCEDURE ::= {
-    &InitiatingMessage INTEGER,
-    &SuccessfulOutcome PrintableString,
-    &procedureCode     id-Iu-Release4,
-    &criticality       reject
-    }
-
-object5 RANAP-ELEMENTARY-PROCEDURE ::= {
-    &InitiatingMessage INTEGER,
-    &SuccessfulOutcome PrintableString,
-    &Outcome           ProcedureCode,
-    &vartypvalue       12,
-    &infoObject        object4,
-    &InfObjectSet      MyObjectSet,
-    &procedureCode     id-Iu-Release5,
-    &criticality       reject
-    }
-
-
-RANAP-ELEMENTARY-PROCEDURES RANAP-ELEMENTARY-PROCEDURE ::= {
-    iu-Release         |
-    relocationPreparation ,
-    ...
-    }
-
-RANAP-ELEMENTARY-PROCEDURES2 RANAP-ELEMENTARY-PROCEDURE ::= {
-    iu-Release         |
-    relocationPreparation
-    }
-
-
-OBJECTSET1 RANAP-ELEMENTARY-PROCEDURE ::= {
-    {INITIATING MESSAGE Iu-ReleaseCommand SUCCESSFUL OUTCOME Iu-ReleaseComplete PROCEDURE CODE id-Iu-Release1 CRITICALITY ignore} | {INITIATING MESSAGE Iu-ReleaseCommand PROCEDURE CODE id-Iu-Release2}
-    }
-
-OBJECTSET2 RANAP-ELEMENTARY-PROCEDURE ::= {
-    iu-Release |
-    {INITIATING MESSAGE Iu-ReleaseCommand SUCCESSFUL OUTCOME Iu-ReleaseComplete PROCEDURE CODE id-Iu-Release4 CRITICALITY ignore} |
-    relocationPreparation |
-    {INITIATING MESSAGE Iu-ReleaseCommand PROCEDURE CODE id-Iu-Release5} ,
-    ...
-    }
-
-OBJECTSET3 RANAP-ELEMENTARY-PROCEDURE ::= {
-    iu-Release,
-    ...
-    }
-
-OBJECTSET4 RANAP-ELEMENTARY-PROCEDURE ::= {
-    iu-Release
-    }
-
-Iu-ReleaseCommand  ::= SEQUENCE {
-    first     INTEGER,
-    second    BOOLEAN
-    }
-
-Iu-ReleaseComplete ::= INTEGER (1..510)
-
-ProcedureCode      ::= INTEGER (0..255)
-Criticality        ::= ENUMERATED { reject, ignore, notify }
-id-Iu-Release1				INTEGER ::= 1
-id-Iu-Release2				INTEGER ::= 2
-id-Iu-Release3				INTEGER ::= 3
-id-Iu-Release4				INTEGER ::= 4
-id-Iu-Release5				INTEGER ::= 5
-
-END
-
-
diff --git a/lib/asn1/test/asn1_SUITE_data/MAP-insertSubscriberData-def.py b/lib/asn1/test/asn1_SUITE_data/MAP-insertSubscriberData-def.py
deleted file mode 100644
index 298319b0ed..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/MAP-insertSubscriberData-def.py
+++ /dev/null
@@ -1,102 +0,0 @@
-MAP-insertSubscriberData-def
-	{ ccitt (0) identified-organization( 4) etsi( 0) mobileDomain(0)
-		gsm-Network( 1) modules( 3) map-Protocol( 4) version2(2) }
-DEFINITIONS ::=
-
-BEGIN
-
-EXPORTS
-InsertSubsDataArg, InsertSubsDatRes;
-IMPORTS
-IMSI, ISDN-AddressString, LMSI FROM MAP-commonDataTypes;
-
-InsertSubsDataArg ::=	SEQUENCE{
-      imsi            [0] IMPLICIT IMSI	OPTIONAL, 
-      msisdn          [1] IMPLICIT ISDN-AddressString OPTIONAL,
-      category        [2] IMPLICIT OCTET STRING (SIZE(1)) OPTIONAL,
-      subscriberStatus [3] IMPLICIT SubscriberStatus OPTIONAL,
-      bearerServiceList [4] IMPLICIT SEQUENCE OF
-      		                       OCTET STRING(SIZE(1)) OPTIONAL,
-      teleServiceList [6] IMPLICIT SEQUENCE OF
-      		                       OCTET STRING(SIZE(1)) OPTIONAL,
-      provisionedSS [7] IMPLICIT SEQUENCE  OF SS-Information OPTIONAL
-         	                }
-
-SS-Information ::= CHOICE{
-          forwardingInfo [0]  IMPLICIT ForwardingInfo, 
-          callBarringInfoInfo [1] IMPLICIT CallBarringInfoInfo,
-          ss-Data [3] IMPLICIT SS-Data                                                                 } 
-          
-SS-Data ::= SEQUENCE {
-          ss-Code   OCTET STRING (SIZE(1)),
-          ss-Status  [4] IMPLICIT OCTET STRING (SIZE(1))
-                       }
-                       
-
-ForwardingInfo ::= SEQUENCE {
-     	    ss-Code OCTET STRING(SIZE(1)) OPTIONAL,
-           forwardingFeatureList ForwardingFeatureList  
- 	                   }
- 	                   
-CallBarringInfoInfo ::= SEQUENCE {
-            ss-Code  OCTET STRING(SIZE(1)) OPTIONAL,
-            callBarringFeatureList CallBarringFeatureList}
-            
-CallBarringFeatureList ::= SEQUENCE OF   CallBarringFeature
-
-CallBarringFeature ::=                SEQUENCE{
-                basicService  BasicServiceCode OPTIONAL,
-                ss-Status [2]  IMPLICIT OCTET STRING(SIZE(1)) OPTIONAL
-                       }
-
-InsertSubsDatRes ::= 
-  SEQUENCE {
-   teleServiceList   [1]  IMPLICIT SEQUENCE OF
-       OCTET STRING (SIZE(1))  OPTIONAL,
-    bearerServiceList [2]  IMPLICIT SEQUENCE OF
-                               OCTET STRING (SIZE(1)) OPTIONAL,
-    ss-List           [3]  IMPLICIT SEQUENCE OF
-                               OCTET STRING (SIZE(1)) OPTIONAL,
-   odb-GeneralData [4] IMPLICIT BIT STRING {
-      allOG-CallsBarred (0),
-      internationalOGCallsBarred (1),
-      internationalOGCallsNotToHPLMN-CountryBarred (2),
-      premiumRateInformationOGCallsBarred (3),
-      premiumRateEntertainementOGCallsBarred (4),
-      ss-AccessBarred (5)                  } (SIZE(6)) OPTIONAL,
-   regionalSubscriptionResponse [5] IMPLICIT ENUMERATED{
-     msc-AreaRestricted (0),
-     tooManyZoneCodes (1),
-     zoneCodeConflict (2),
-     regionalSubscNotSupported (3)                      } OPTIONAL
-            }
-            
-            
-ForwardingFeatureList ::= SEQUENCE OF ForwardingFeature
-
-ForwardingFeature ::=             SEQUENCE{
-                basicService BasicServiceCode OPTIONAL,
- 	        ss-Status [4]  IMPLICIT OCTET STRING(SIZE(1)) OPTIONAL,     
- 	        forwardedToNumber [5]  ISDN-AddressString OPTIONAL,
-                forwardingOptions [6]  IMPLICIT OCTET STRING(SIZE(1)) OPTIONAL,
-               noReplyConditionTime [7]  IMPLICIT INTEGER(5..30) OPTIONAL
-                  }
-
-
-BasicServiceCode ::=  CHOICE {
-                  bearerService [2]  IMPLICIT OCTET STRING(SIZE(1)),
- 	          teleService [3]  IMPLICIT OCTET STRING(SIZE(1))      
-	                 }
- 	                 
-
-BasicServiceGroupList ::= SEQUENCE OF
-		 BasicServiceCode
-
-            
-SubscriberStatus ::=           ENUMERATED {
-      		           serviceGranted (0),
-      		           operatorDeterminedBarring (1)
-      		                                }             
-     
-END  -- of MAP-insertSubscriberData-def
-
diff --git a/lib/asn1/test/asn1_SUITE_data/Mod.set.asn b/lib/asn1/test/asn1_SUITE_data/Mod.set.asn
deleted file mode 100644
index 5dcd8706ae..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Mod.set.asn
+++ /dev/null
@@ -1,5 +0,0 @@
-Mod1.asn
-Mod2.asn
-Mod3.asn
-Mod4.asn
-Mod5.asn
diff --git a/lib/asn1/test/asn1_SUITE_data/Mod1.asn b/lib/asn1/test/asn1_SUITE_data/Mod1.asn
deleted file mode 100644
index cb29997985..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Mod1.asn
+++ /dev/null
@@ -1,18 +0,0 @@
-Mod1 DEFINITIONS AUTOMATIC TAGS ::=
-
-BEGIN
-
-IMPORTS
-    Co,Reg
-    FROM Mod5
-    Name
-    FROM Mod4;
-
-
-L ::= SEQUENCE {
-  country  Co,
-  region  Reg,
-  name  Name
-}
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/Mod2.asn b/lib/asn1/test/asn1_SUITE_data/Mod2.asn
deleted file mode 100644
index cc22c6f13c..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Mod2.asn
+++ /dev/null
@@ -1,43 +0,0 @@
-Mod2 DEFINITIONS AUTOMATIC TAGS ::=
-
-BEGIN
-
-IMPORTS
-    Stat,Country
-    FROM Mod3
-    L
-    FROM Mod1
-    Time,LocName,ThingName,Name
-    FROM Mod4;
-    
-T ::= SEQUENCE {
-  unit ENUMERATED{celsius,fahrenheit,kelvin},
-  degree INTEGER,
-  location L,
-  time  Time,
-  statistics Stat
-}
-
-OtherName ::= SEQUENCE {
-  locationName LocName,
-  thingName    ThingName
-}
-
-FirstName ::= CHOICE {
-  firstname    PrintableString,
-  nickname     PrintableString
-}
-
-FamilyName ::= SEQUENCE{
-  prefix  ENUMERATED{none,von,af},
-  secondname PrintableString
-}
-
-Lang ::= SEQUENCE{
-  l PrintableString}
-
-Inhabitant ::= SEQUENCE {
-  name Name,
-  country Country}
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/Mod3.asn b/lib/asn1/test/asn1_SUITE_data/Mod3.asn
deleted file mode 100644
index 8069bedcf9..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Mod3.asn
+++ /dev/null
@@ -1,33 +0,0 @@
-Mod3 DEFINITIONS AUTOMATIC TAGS ::=
-
-BEGIN
-
-IMPORTS
-    Name
-    FROM Mod4
-    Lang, Inhabitant,FirstName,FamilyName
-    FROM Mod2
-    TS, RFS, WS, HS
-    FROM Mod5;
-
-Stat ::= SEQUENCE {
-  tempstat TS,
-  rainfallstat RFS,
-  windstat  WS,
-  humiditystat HS
-}
-
-Country ::= SEQUENCE{
-  name Name,
-  language Lang
-}
-
-RegionName ::= Name
-Inhabitants ::= SEQUENCE OF Inhabitant
-
-PersonName ::= SEQUENCE {
-  name1 FirstName,
-  name2 FamilyName
-}
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/Mod4.asn b/lib/asn1/test/asn1_SUITE_data/Mod4.asn
deleted file mode 100644
index 4a1aaff9dc..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Mod4.asn
+++ /dev/null
@@ -1,33 +0,0 @@
-Mod4 DEFINITIONS AUTOMATIC TAGS ::=
-
-
-BEGIN
-
-IMPORTS
-    PersonName
-    FROM Mod3
-    OtherName,FirstName,FamilyName
-    FROM Mod2;
-
-Time ::= SEQUENCE {
-  year  OCTET STRING(SIZE(4)),
-  month OCTET STRING(SIZE(2)),
-  hour  INTEGER,
-  minute INTEGER
-}
-
-Name ::= CHOICE {
-  person PersonName,
-  othername OtherName
-}
-
-
-
-LocName ::= SEQUENCE {
-  region ENUMERATED{gotaland,svealand,norrland},
-  name  PrintableString
-}
-
-ThingName ::= PrintableString
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/Mod5.asn b/lib/asn1/test/asn1_SUITE_data/Mod5.asn
deleted file mode 100644
index 71b483d0e0..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Mod5.asn
+++ /dev/null
@@ -1,37 +0,0 @@
-Mod5 DEFINITIONS AUTOMATIC TAGS ::=
-
-BEGIN
-
-IMPORTS
-    Country,RegionName,Inhabitants
-    FROM Mod3;
-TS ::= SEQUENCE {
-  average  INTEGER,
-  highest  INTEGER,
-  lowest   INTEGER
-}
-
-RFS ::= SEQUENCE {
-  average INTEGER,
-  highest INTEGER
-}
-
-WS ::= SEQUENCE {
-  average INTEGER,
-  highest INTEGER
-}
-
-HS ::= SEQUENCE {
-  average INTEGER,
-  highest INTEGER,
-  lowest INTEGER
-}
-
-Co ::= Country
-
-Reg ::= SEQUENCE {
-  name RegionName,
-  inhabitants Inhabitants
-}
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/Mvrasn.set.asn b/lib/asn1/test/asn1_SUITE_data/Mvrasn.set.asn
deleted file mode 100644
index 8a61da0160..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Mvrasn.set.asn
+++ /dev/null
@@ -1,7 +0,0 @@
-Mvrasn-11-6.asn
-Mvrasn-21-4.asn
-Mvrasn-20-6.asn
-Mvrasn-19-6.asn
-Mvrasn-15-6.asn
-Mvrasn-18-6.asn
-Mvrasn-14-6.asn
diff --git a/lib/asn1/test/asn1_SUITE_data/P-Record.asn1db b/lib/asn1/test/asn1_SUITE_data/P-Record.asn1db
deleted file mode 100644
index 13e1162c64..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/P-Record.asn1db
+++ /dev/null
diff --git a/lib/asn1/test/asn1_SUITE_data/P-Record.erl b/lib/asn1/test/asn1_SUITE_data/P-Record.erl
deleted file mode 100644
index 9fc6f50d64..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/P-Record.erl
+++ /dev/null
@@ -1,244 +0,0 @@
-%% Generated by the Erlang ASN.1 BER-compiler version, utilizing bit-syntax:1.3.1.4
-%% Purpose: encoder and decoder to the types in mod P-Record
-
--module('P-Record').
--include("P-Record.hrl").
--define('RT_PER',asn1rt_per_bin).
--export([encoding_rule/0]).
--export([
-'enc_PersonnelRecord'/1,
-'enc_ChildInformation'/1,
-'enc_Name'/1,
-'enc_EmployeeNumber'/1,
-'enc_Date'/1
-]).
-
--export([
-'dec_PersonnelRecord'/2,
-'dec_ChildInformation'/2,
-'dec_Name'/2,
-'dec_EmployeeNumber'/2,
-'dec_Date'/2
-]).
-
--export([
-'v'/0
-]).
-
-
-
--export([encode/2,decode/2,encode_disp/2,decode_disp/2]).
-
-encoding_rule() ->
-   per_bin.
-
-encode(Type,Data) ->
-case catch ?RT_PER:complete(encode_disp(Type,Data)) of
-  {'EXIT',{error,Reason}} ->
-    {error,Reason};
-  {'EXIT',Reason} ->
-    {error,{asn1,Reason}};
-  {Bytes,Len} ->
-    {ok,Bytes};
-  X ->
-    {ok,X}
-end.
-
-decode(Type,Data) ->
-case catch decode_disp(Type,Data) of
-  {'EXIT',{error,Reason}} ->
-    {error,Reason};
-  {'EXIT',Reason} ->
-    {error,{asn1,Reason}};
-  {X,_Rest} ->
-    {ok,X};
-  {X,_Rest,_Len} ->
-    {ok,X}
-end.
-
-encode_disp('PersonnelRecord',Data) -> 'enc_PersonnelRecord'(Data);
-encode_disp('ChildInformation',Data) -> 'enc_ChildInformation'(Data);
-encode_disp('Name',Data) -> 'enc_Name'(Data);
-encode_disp('EmployeeNumber',Data) -> 'enc_EmployeeNumber'(Data);
-encode_disp('Date',Data) -> 'enc_Date'(Data);
-encode_disp(Type,Data) -> exit({error,{asn1,{undefined_type,Type}}}).
-
-
-decode_disp('PersonnelRecord',Data) -> 'dec_PersonnelRecord'(Data,mandatory);
-decode_disp('ChildInformation',Data) -> 'dec_ChildInformation'(Data,mandatory);
-decode_disp('Name',Data) -> 'dec_Name'(Data,mandatory);
-decode_disp('EmployeeNumber',Data) -> 'dec_EmployeeNumber'(Data,mandatory);
-decode_disp('Date',Data) -> 'dec_Date'(Data,mandatory);
-decode_disp(Type,Data) -> exit({error,{asn1,{undefined_type,Type}}}).
-
-
-
-
-
-'enc_PersonnelRecord'(Val) ->
-{Val1,Opt} = ?RT_PER:fixoptionals([{children,6}],Val),
-[
-?RT_PER:setoptionals(Opt),
-
-%% attribute number 1 with type Externaltypereference6P-RecordName
-'enc_Name'(?RT_PER:cindex(2,Val1,name)),
-
-%% attribute number 2 with type VisibleString
-?RT_PER:encode_VisibleString([],?RT_PER:cindex(3,Val1,title)),
-
-%% attribute number 3 with type INTEGER
-?RT_PER:encode_integer([],?RT_PER:cindex(4,Val1,number)),
-
-%% attribute number 4 with type VisibleString
-?RT_PER:encode_VisibleString([],?RT_PER:cindex(5,Val1,dateOfHire)),
-
-%% attribute number 5 with type Externaltypereference10P-RecordName
-'enc_Name'(?RT_PER:cindex(6,Val1,nameOfSpouse)),
-case ?RT_PER:cindex(7,Val1,children) of
-asn1_DEFAULT -> [];
-_ ->
-
-%% attribute number 6 with type SEQUENCE OF
-'enc_PersonnelRecord_children'(?RT_PER:cindex(7,Val1,children))
-end].
-
-'enc_PersonnelRecord_children'({'PersonnelRecord_children',Val}) ->
-'enc_PersonnelRecord_children'(Val);
-
-'enc_PersonnelRecord_children'(Val) ->
-[
-
-   ?RT_PER:encode_length(undefined,length(Val)),
-   'enc_PersonnelRecord_children_components'(Val, [])
-].
-'enc_PersonnelRecord_children_components'([], Acc) -> lists:reverse(Acc);
-
-'enc_PersonnelRecord_children_components'([H|T], Acc) ->
-'enc_PersonnelRecord_children_components'(T, ['enc_ChildInformation'(H)
-
- | Acc]).
-
-'dec_PersonnelRecord_children'(Bytes,Telltype) ->
-
-{Num,Bytes1} = ?RT_PER:decode_length(Bytes,undefined),
-'dec_PersonnelRecord_children_components'(Num, Bytes1, Telltype, []).
-'dec_PersonnelRecord_children_components'(0, Bytes, Telltype, Acc) ->
-   {lists:reverse(Acc), Bytes};
-'dec_PersonnelRecord_children_components'(Num, Bytes, Telltype, Acc) ->
-   {Term,Remain} = 'P-Record':'dec_ChildInformation'(Bytes,Telltype),
-   'dec_PersonnelRecord_children_components'(Num-1, Remain, Telltype, [Term|Acc]).
-
-
-'dec_PersonnelRecord'(Bytes,Telltype) ->
-{Opt,Bytes1} = ?RT_PER:getoptionals(Bytes,1), 
-%%  attribute number 1 with type Name
-{Term1,Bytes2} = 'dec_Name'(Bytes1,telltype),
-
-%% attribute number 2 with type VisibleString
-{Term2,Bytes3} = ?RT_PER:decode_VisibleString(Bytes2,[]),
-
-%% attribute number 3 with type INTEGER
-{Term3,Bytes4} = ?RT_PER:decode_integer(Bytes3,[]),
-
-%% attribute number 4 with type VisibleString
-{Term4,Bytes5} = ?RT_PER:decode_VisibleString(Bytes4,[]),
-
-%%  attribute number 5 with type Name
-{Term5,Bytes6} = 'dec_Name'(Bytes5,telltype),
-
-%% attribute number 6 with type SEQUENCE OF
-{Term6,Bytes7} = case element(1,Opt) of
-1 ->'dec_PersonnelRecord_children'(Bytes6, Telltype);
-0 ->{[],Bytes6}
-
-end,
-{{'PersonnelRecord',Term1,Term2,Term3,Term4,Term5,Term6},Bytes7}.
-
-'enc_ChildInformation'(Val) ->
-{Val1,Opt} = ?RT_PER:fixoptionals([{name,1},{dateOfBirth,2}],Val),
-[
-?RT_PER:setoptionals(Opt),
-case ?RT_PER:cindex(2,Val1,name) of
-asn1_NOVALUE -> [];
-_ ->
-
-%% attribute number 1 with type Externaltypereference15P-RecordName
-'enc_Name'(?RT_PER:cindex(2,Val1,name))
-end,
-case ?RT_PER:cindex(3,Val1,dateOfBirth) of
-asn1_NOVALUE -> [];
-_ ->
-
-%% attribute number 2 with type VisibleString
-?RT_PER:encode_VisibleString([],?RT_PER:cindex(3,Val1,dateOfBirth))
-end].
-
-
-'dec_ChildInformation'(Bytes,Telltype) ->
-{Opt,Bytes1} = ?RT_PER:getoptionals(Bytes,2), 
-%%  attribute number 1 with type Name
-{Term1,Bytes2} = case element(1,Opt) of
-1 ->'dec_Name'(Bytes1,telltype);
-0 ->{asn1_NOVALUE,Bytes1}
-
-end,
-
-%% attribute number 2 with type VisibleString
-{Term2,Bytes3} = case element(2,Opt) of
-1 ->?RT_PER:decode_VisibleString(Bytes2,[]);
-0 ->{asn1_NOVALUE,Bytes2}
-
-end,
-{{'ChildInformation',Term1,Term2},Bytes3}.
-
-'enc_Name'(Val) ->
-Val1 = ?RT_PER:list_to_record('Name', Val),
-[
-
-%% attribute number 1 with type VisibleString
-?RT_PER:encode_VisibleString([],?RT_PER:cindex(2,Val1,givenName)),
-
-%% attribute number 2 with type VisibleString
-?RT_PER:encode_VisibleString([],?RT_PER:cindex(3,Val1,initial)),
-
-%% attribute number 3 with type VisibleString
-?RT_PER:encode_VisibleString([],?RT_PER:cindex(4,Val1,familyName))].
-
-
-'dec_Name'(Bytes,Telltype) ->
-
-%% attribute number 1 with type VisibleString
-{Term1,Bytes1} = ?RT_PER:decode_VisibleString(Bytes,[]),
-
-%% attribute number 2 with type VisibleString
-{Term2,Bytes2} = ?RT_PER:decode_VisibleString(Bytes1,[]),
-
-%% attribute number 3 with type VisibleString
-{Term3,Bytes3} = ?RT_PER:decode_VisibleString(Bytes2,[]),
-{{'Name',Term1,Term2,Term3},Bytes3}.
-
-
-'enc_EmployeeNumber'({'EmployeeNumber',Val}) ->
-'enc_EmployeeNumber'(Val);
-
-'enc_EmployeeNumber'(Val) ->
-?RT_PER:encode_integer([],Val).
-
-
-'dec_EmployeeNumber'(Bytes,Telltype) ->
-?RT_PER:decode_integer(Bytes,[]).
-
-
-'enc_Date'({'Date',Val}) ->
-'enc_Date'(Val);
-
-'enc_Date'(Val) ->
-?RT_PER:encode_VisibleString([],Val).
-
-
-'dec_Date'(Bytes,Telltype) ->
-?RT_PER:decode_VisibleString(Bytes,[]).
-
-'v'() ->
-{'PersonnelRecord',{'Name',{74,111,104,110},[80],[83,109,105,116,104]},[68,105,114,101,99,116,111,114],51,[49,57,55,49,48,57,49,55],{'Name',{77,97,114,121},[84],[83,109,105,116,104]},[{'ChildInformation',{'Name',[82,97,108,112,104],[84],[83,109,105,116,104]},[49,57,53,55,49,49,49,49]},{'ChildInformation',{'Name',[83,117,115,97,110],[66],[74,111,110,101,115]},[49,57,53,57,48,55,49,55]}]}.
-
diff --git a/lib/asn1/test/asn1_SUITE_data/P-Record.hrl b/lib/asn1/test/asn1_SUITE_data/P-Record.hrl
deleted file mode 100644
index 92aa1a44e2..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/P-Record.hrl
+++ /dev/null
@@ -1,17 +0,0 @@
-%% Generated by the Erlang ASN.1 compiler version:1.3.1.4
-%% Purpose: Erlang record definitions for each named and unnamed
-%% SEQUENCE and SET, and macro definitions for each value
-%% definition,in module P-Record
-
-
-
--record('PersonnelRecord',{
-name, title, number, dateOfHire, nameOfSpouse, children = asn1_DEFAULT}).
-
--record('ChildInformation',{
-name = asn1_NOVALUE, dateOfBirth = asn1_NOVALUE}).
-
--record('Name',{
-givenName, initial, familyName}).
-
--define('v', {'PersonnelRecord',{'Name',{74,111,104,110},[80],[83,109,105,116,104]},[68,105,114,101,99,116,111,114],51,[49,57,55,49,48,57,49,55],{'Name',{77,97,114,121},[84],[83,109,105,116,104]},[{'ChildInformation',{'Name',[82,97,108,112,104],[84],[83,109,105,116,104]},[49,57,53,55,49,49,49,49]},{'ChildInformation',{'Name',[83,117,115,97,110],[66],[74,111,110,101,115]},[49,57,53,57,48,55,49,55]}]}).
diff --git a/lib/asn1/test/asn1_SUITE_data/PDUs.py b/lib/asn1/test/asn1_SUITE_data/PDUs.py
deleted file mode 100644
index 907348193f..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/PDUs.py
+++ /dev/null
@@ -1,325 +0,0 @@
-PDUs DEFINITIONS ::=
-
--- Search for 'org' to find changes for erlang.
-
--- SnmpMgmtCom and PDUs only for dbg.
-
-
-BEGIN
-EXPORTS SnmpPrivMsg, SnmpAuthMsg, SnmpMgmtCom, PDUs;
-
--- From RFC 1442
-
-          -- names of objects
-
-          ObjectName ::=
-              OBJECT IDENTIFIER
-
-
-          -- syntax of objects
-
-          ObjectSyntax ::=
-              CHOICE {
-                  simple
-                      SimpleSyntax,
-
-                    -- note that SEQUENCEs for conceptual tables and
-                    -- rows are not mentioned here...
-
-                  applicationWide
-                      ApplicationSyntax
-              }
-
-
-          -- built-in ASN.1 types
-
-          SimpleSyntax ::=
-              CHOICE {
-                  -- INTEGERs with a more restrictive range
-                  -- may also be used
-                  integerValue
-                      INTEGER, 
-
-                  stringValue
-                      OCTET STRING,
-
-                  objectIDValue
-                      OBJECT IDENTIFIER,
-
-                  -- only the enumerated form is allowed
-                  bitValue
-                      BIT STRING
-              }
-
-
-          -- indistinguishable from INTEGER, but never needs more than
-          -- 32Bits for a two's complement representation
-          Integer32 ::=
-              [UNIVERSAL 2]
-                  IMPLICIT INTEGER (-2147483648..2147483647)
-
-
-          -- applicationWide types
-
-          ApplicationSyntax ::=
-              CHOICE {
-                  ipAddressValue
-                      IpAddress,
-
-                  counterValue
-                      Counter32,
-
-                  gaugeValue
-                      Gauge32,
-
-                  timeticksValue
-                      TimeTicks,
-
-                  arbitraryValue
-                      Opaque,
-
-                  nsapAddressValue
-                      NsapAddress,
-
-                  bigCounterValue
-                      Counter64,
-
-                  unsignedIntegerValue
-                      UInteger32
-              }
-
-          -- in networkByte order
-          -- (this is a tagged type for historical reasons)
-          IpAddress ::=
-              [APPLICATION 0]
-                  IMPLICIT OCTET STRING (SIZE (4))
-
-
-
-
-          -- this wraps
-          Counter32 ::=
-              [APPLICATION 1]
-                  IMPLICIT INTEGER (0..4294967295)
-
-          -- this doesn't wrap
-          Gauge32 ::=
-              [APPLICATION 2]
-                  IMPLICIT INTEGER (0..4294967295) 
-
-          -- hundredths of seconds since an epoch
-          TimeTicks ::=
-              [APPLICATION 3]
-                  IMPLICIT INTEGER (0..4294967295)
-
-          -- for backwardCompatibility only
-          Opaque ::=
-              [APPLICATION 4]
-                  IMPLICIT OCTET STRING
-
-          -- for OSI NSAP addresses
-          -- (this is a tagged type for historical reasons)
-          NsapAddress ::=
-              [APPLICATION 5]
--- org:                  IMPLICIT OCTET STRING (SIZE (1 | 4..21))
-                  IMPLICIT OCTET STRING
-
-          -- for counters that wrap in less than one hour with only 32 bits
-          Counter64 ::=
-              [APPLICATION 6]
-                  IMPLICIT INTEGER (0..18446744073709551615)
-
-          -- an unsigned 32Bit quantity
-          UInteger32 ::=
-              [APPLICATION 7]
-                  IMPLICIT INTEGER (0..4294967295)
-
-
--- From RFC 1445
-
-          SnmpPrivMsg ::= [1] IMPLICIT SEQUENCE {
-             privDst
-                OBJECT IDENTIFIER,
-             privData
-                [1] IMPLICIT OCTET STRING
-           }
-
-           SnmpAuthMsg ::= [1] IMPLICIT SEQUENCE {
-             authInfo
-                ANY, -- defined by authentication protocol
-             authData
-                SnmpMgmtCom
-           }
-
-           SnmpMgmtCom ::= [2] IMPLICIT SEQUENCE {
-             dstParty
-                OBJECT IDENTIFIER,
-             srcParty
-                OBJECT IDENTIFIER,
-             context
-                OBJECT IDENTIFIER,
-             pdu
-                PDUs
-           }
-
-
--- From RFC 1448
-
-                -- org: no tag at all. we need a tag to test 'PDUs'. 
-               PDUs ::= [PRIVATE 1]
-                   -- remove tag when 'PDUs' only is used in another type.
-                   CHOICE {
-                       getRequest
-                           GetRequestPdu,
-
-                       getNextRequest
-                           GetNextRequestPdu,
-
-                       getBulkRequest
-                           GetBulkRequestPdu,
-
-                       response
-                           ResponsePdu,
-
-                       setRequest
-                           SetRequestPdu,
-
-                       informRequest
-                           InformRequestPdu,
-
-                       snmpV2Trap
-                           SNMPv2TrapPdu
-                   }
-
-               -- PDUs
-
-               GetRequestPdu ::=
-                   [0]
-                       IMPLICIT PDU
-
-               GetNextRequestPdu ::=
-                   [1]
-                       IMPLICIT PDU
-
-               ResponsePdu ::=
-                   [2]
-                       IMPLICIT PDU
-
-               SetRequestPdu ::=
-                   [3]
-                       IMPLICIT PDU
-
-               -- [4] is obsolete
-
-               GetBulkRequestPdu ::=
-                   [5]
-                       IMPLICIT BulkPDU
-
-               InformRequestPdu ::=
-                   [6]
-                       IMPLICIT PDU
-
-               SNMPv2TrapPdu ::=
-                   [7]
-                       IMPLICIT PDU
-
-
-               maxBindings
-                   INTEGER ::= 2147483647
-
-               PDU ::=
-                   SEQUENCE {
-                       requestId
-                           Integer32,
-
-                       errorStatus            -- sometimes ignored
-                           INTEGER {
-                               noError(0),
-                               tooBig(1),
-                               noSuchName(2),   -- for proxy compatibility
-                               badValue(3),     -- for proxy compatibility
-                               readOnly(4),     -- for proxy compatibility
-                               genErr(5),
-                               noAccess(6),
-                               wrongType(7),
-                               wrongLength(8),
-                               wrongEncoding(9),
-                               wrongValue(10),
-                               noCreation(11),
-                               inconsistentValue(12),
-                               resourceUnavailable(13),
-                               commitFailed(14),
-                               undoFailed(15),
-                               authorizationError(16),
-                               notWritable(17),
-                               inconsistentName(18)
-                           },
-
-                       errorIndex            -- sometimes ignored
-                           INTEGER (0..maxBindings),
-
-                       variableBindings   -- values are sometimes ignored
-                           VarBindList
-                   }
-
-
-               BulkPDU ::=                     -- MUST be identical in
-                   SEQUENCE {                  -- structure to PDU
-                       requestId
-                           Integer32,
-
-                       nonRepeaters
-                           INTEGER (0..maxBindings),
-
-                       maxRepetitions
-                           INTEGER (0..maxBindings),
-
-                       variableBindings       -- values are ignored
-                           VarBindList
-                   }
-
-
-               VarBind ::=
-                   SEQUENCE {
-                       name
-                           ObjectName,
-
-                       data CHOICE {
-                           value
-                               ObjectSyntax,
-
-                           unSpecified         -- in retrieval requests
-                                   NULL,
-
-                                               -- exceptions in responses
-                           noSuchObject[0]
-                                   IMPLICIT NULL,
-
-                           noSuchInstance[1]
-                                   IMPLICIT NULL,
-
-                           endOfMibView[2]
-                                   IMPLICIT NULL
-                       }
-                   }
-
-
-               -- variableBinding list
-
-               VarBindList ::=
-                   SEQUENCE OF VarBind
-
--- org:
---               VarBindList ::=
---                   SEQUENCE (SIZE (0..maxBindings)) OF
---                       VarBind
-
-END
-
-
-
-
-
-
-
-
diff --git a/lib/asn1/test/asn1_SUITE_data/Pattern.asn b/lib/asn1/test/asn1_SUITE_data/Pattern.asn
deleted file mode 100644
index 730b4ba32a..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Pattern.asn
+++ /dev/null
@@ -1,8 +0,0 @@
-Pattern DEFINITIONS AUTOMATIC TAGS ::=
-
-BEGIN
-
-DateAndTime ::= VisibleString (PATTERN "\d#2/\d#2/\d#4-\d#2:\d#2") 
--- DD/MM/YYY-HH:MM
-
-END
\ No newline at end of file
diff --git a/lib/asn1/test/asn1_SUITE_data/Prim.asn1 b/lib/asn1/test/asn1_SUITE_data/Prim.asn1
index c3d54dbbb3..cc0e61422a 100644
--- a/lib/asn1/test/asn1_SUITE_data/Prim.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/Prim.asn1
@@ -47,5 +47,15 @@ BEGIN
     b Bool,
     i4 INTEGER (0..63)
   }    
-    
+
+  ASeq ::= SEQUENCE {
+    e254 BOOLEAN,
+    i254 INTEGER (0..254),
+    e255 BOOLEAN,
+    i255 INTEGER (0..255),
+    e256 BOOLEAN,
+    i256 INTEGER (0..256),
+    e BOOLEAN,
+    magic INTEGER
+  }
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
index cfaf4cf034..08e7f94ab6 100644
--- a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
@@ -5,7 +5,7 @@ BEGIN
   Bs1 ::= BIT STRING
   Bs2 ::= BIT STRING {su(0), mo(1), tu(2), we(3), th(4), fr(5), sa(6) } (SIZE (7))
   Bs3 ::= BIT STRING {su(0), mo(1), tu(2), we(3), th(4), fr(5), sa(6) } (SIZE (1..7))
-  Bs4 ::= BIT STRING {su(0), mo(1), tu(2), we(3), th(4), fr(5), sa(6) } (SIZE (1..32))
+  Bs4 ::= BIT STRING {su(0), mo(1), tu(2), we(3), th(4), fr(5), sa(6) }
   Bs5 ::= BIT STRING {su(0), mo(17), tu(2), we(3), th(4), fr(5), sa(6) } (SIZE (1..32))
   Bs6 ::= BIT STRING {su(0), mo(17), tu(2), we(3), th(4), fr(5), sa(6)} (SIZE (16..32))
   Bs7 ::= BIT STRING (SIZE (24))
@@ -55,10 +55,15 @@ BS1024 ::= BIT STRING (SIZE (1024))
   OsExpCon ::= [60] EXPLICIT OCTET STRING
   OsExpPri ::= [PRIVATE 61] EXPLICIT  OCTET STRING
   OsExpApp ::= [APPLICATION 62] EXPLICIT OCTET STRING
+
   OsFrag ::= OCTET STRING (SIZE (0..100000))
   FixedOs65536 ::= OCTET STRING (SIZE (65536))
   FixedOs65537 ::= OCTET STRING (SIZE (65537))
 
+  OsFragExt ::= OCTET STRING (SIZE (0..100000, ...))
+  FixedOs65536Ext ::= OCTET STRING (SIZE (65536, ...))
+  FixedOs65537Ext ::= OCTET STRING (SIZE (65537, ...))
+
   OsFixedStrings ::= SEQUENCE {
     b1 BOOLEAN,  -- Unalign
     s0 OCTET STRING (SIZE (0)),
@@ -72,6 +77,32 @@ BS1024 ::= BIT STRING (SIZE (1024))
     i INTEGER (0..1024)
   }
 
+  OsFixedStringsExt ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 OCTET STRING (SIZE (0, ...)),
+    s1 OCTET STRING (SIZE (1, ...)),
+    s2 OCTET STRING (SIZE (2, ...)),
+    s3 OCTET STRING (SIZE (3, ...)),
+    b2 BOOLEAN,  -- Unalign
+    s255 OCTET STRING (SIZE (255, ...)),
+    s256 OCTET STRING (SIZE (256, ...)),
+    s257 OCTET STRING (SIZE (257, ...)),
+    i INTEGER (0..1024)
+  }
+
+  OsVarStringsExt ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 OCTET STRING (SIZE (0, ...)),
+    s1 OCTET STRING (SIZE (0..1, ...)),
+    s2 OCTET STRING (SIZE (1..2, ...)),
+    s3 OCTET STRING (SIZE (2..3, ...)),
+    b2 BOOLEAN,  -- Unalign
+    s255 OCTET STRING (SIZE (254..255, ...)),
+    s256 OCTET STRING (SIZE (255..256, ...)),
+    s257 OCTET STRING (SIZE (256..257, ...)),
+    i INTEGER (0..1024)
+  }
+
   OsAlignment ::= SEQUENCE {
     b1 BOOLEAN,
     s1 Os,
@@ -82,6 +113,52 @@ BS1024 ::= BIT STRING (SIZE (1024))
     i INTEGER (0..63)
   }
 
+  IA5FixedStrings ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 IA5String (SIZE (0)),
+    s1 IA5String (SIZE (1)),
+    s2 IA5String (SIZE (2)),
+    s3 IA5String (SIZE (3)),
+    b2 BOOLEAN,  -- Unalign
+    s4 IA5String (SIZE (4)),
+    b3 BOOLEAN,  -- Unalign
+    s255 IA5String (SIZE (255)),
+    s256 IA5String (SIZE (256)),
+    s257 IA5String (SIZE (257)),
+    i INTEGER (0..1024)
+  }
+
+  IA5FixedStringsExt ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 IA5String (SIZE (0, ...)),
+    s1 IA5String (SIZE (1, ...)),
+    s2 IA5String (SIZE (2, ...)),
+    s3 IA5String (SIZE (3, ...)),
+    b2 BOOLEAN,  -- Unalign
+    s4 IA5String (SIZE (4, ...)),
+    b3 BOOLEAN,  -- Unalign
+    s255 IA5String (SIZE (255, ...)),
+    s256 IA5String (SIZE (256, ...)),
+    s257 IA5String (SIZE (257, ...)),
+    i INTEGER (0..1024)
+  }
+
+  IA5VarStringsExt ::= SEQUENCE {
+    b1 BOOLEAN,  -- Unalign
+    s0 IA5String (SIZE (0, ...)),
+    s1 IA5String (SIZE (0..1, ...)),
+    s2 IA5String (SIZE (1..2, ...)),
+    s3 IA5String (SIZE (2..3, ...)),
+    b2 BOOLEAN,  -- Unalign
+    s4 IA5String (SIZE (3..4, ...)),
+    b3 BOOLEAN,  -- Unalign
+    s255 IA5String (SIZE (254..255, ...)),
+    s256 IA5String (SIZE (255..256, ...)),
+    s257 IA5String (SIZE (256..257, ...)),
+    i INTEGER (0..1024)
+  }
+
+
   Ns ::= NumericString
   NsCon ::= [70] NumericString
   NsExpCon ::= [71] EXPLICIT NumericString
diff --git a/lib/asn1/test/asn1_SUITE_data/ROSE.asn1 b/lib/asn1/test/asn1_SUITE_data/ROSE.asn1
deleted file mode 100644
index 2fefae3caf..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/ROSE.asn1
+++ /dev/null
@@ -1,449 +0,0 @@
-ROSE DEFINITIONS IMPLICIT TAGS ::=
-
-
-BEGIN
-
-OPERATION ::= CLASS
-{
-    &ArgumentType OPTIONAL,
-    &argumentTypeOptional BOOLEAN OPTIONAL,
-    &returnResult BOOLEAN DEFAULT TRUE,
-    &ResultType OPTIONAL,
-    &resultTypeOptional BOOLEAN OPTIONAL,
-    &Errors ERROR OPTIONAL,
-    &Linked OPERATION OPTIONAL,
-  &synchronous BOOLEAN DEFAULT FALSE,
-  &idempotent  BOOLEAN  DEFAULT FALSE,
-    &alwaysReturns BOOLEAN DEFAULT TRUE,
-    &InvokePriority Priority OPTIONAL,
-    &ResultPriority Priority OPTIONAL,
-    &operationCode Code UNIQUE OPTIONAL
-    }
-WITH SYNTAX
- {
-   [ARGUMENT &ArgumentType [OPTIONAL &argumentTypeOptional]]
-   [RESULT &ResultType [OPTIONAL &resultTypeOptional]]
-   [RETURN RESULT &returnResult]
-   [ERRORS &Errors]
-   [LINKED &Linked]
-   [SYNCHRONOUS &synchronous]
-   [IDEMPOTENT &idempotent]
-   [ALWAYS RESPONDS &alwaysReturns]
-   [INVOKE PRIORITY &InvokePriority]
-   [RESULT-PRIORITY &ResultPriority]
-   [CODE &operationCode]
- }
-
-ERROR ::= CLASS
-{
-    &ParameterType OPTIONAL,
-    &parameterTypeOptional BOOLEAN OPTIONAL,
-    &ErrorPriority Priority OPTIONAL,
-    &errorCode Code UNIQUE OPTIONAL
-    }
-WITH SYNTAX
-{
-    [PARAMETER &ParameterType [OPTIONAL &parameterTypeOptional]]
-    [PRIORITY &ErrorPriority]
-    [CODE &errorCode]
-    }
-
-OPERATION-PACKAGE ::= CLASS
-{
-    &Both OPERATION OPTIONAL,
-    &Consumer OPERATION OPTIONAL,
-    &Supplier OPERATION OPTIONAL,
-    &id OBJECT IDENTIFIER UNIQUE OPTIONAL
-    }
-WITH SYNTAX
-{
-    [OPERATIONS &Both]
-    [CONSUMER INVOKES &Supplier]
-    [SUPPLIER INVOKES &Consumer]
-    [ID &id]
-    }
-
-CONNECTION-PACKAGE ::= CLASS
-{
-    &bind OPERATION DEFAULT emptyBind,
-    &unbind OPERATION DEFAULT emptyUnbind,
-    &responderCanUnbind BOOLEAN DEFAULT FALSE,
-    &unbindCanFail BOOLEAN DEFAULT FALSE,
-    &id OBJECT IDENTIFIER UNIQUE OPTIONAL
-    }
-WITH SYNTAX
-{
-    [BIND &bind]
-    [UNBIND &unbind]
-    [RESPONDER UNBIND &responderCanUnbind]
-    [FAILURE TO UNBIND &unbindCanFail]
-    [ID &id]
-    }
-
-CONTRACT ::= CLASS
-{
-    &connection CONNECTION-PACKAGE OPTIONAL,
-    &OperationsOf OPERATION-PACKAGE OPTIONAL,
-    &InitiatorConsumerOf OPERATION-PACKAGE OPTIONAL,
-    &InitiatorSupplierOf OPERATION-PACKAGE OPTIONAL,
-    &id OBJECT IDENTIFIER UNIQUE OPTIONAL
-    }
-WITH SYNTAX
-{
-    [CONNECTION &connection]
-    [OPERATIONS OF &OperationsOf]
-    [INITIATOR CONSUMER OF &InitiatorConsumerOf]
-    [RESPONDER CONSUMER OF &InitiatorSupplierOf]
-    [ID &id]
-}
-
-ROS-OBJECT-CLASS ::= CLASS
-{
-    &Is ROS-OBJECT-CLASS OPTIONAL,
-    &Initiates CONTRACT OPTIONAL,
-    &Responds CONTRACT OPTIONAL,
-    &InitiatesAndResponds CONTRACT OPTIONAL,
-    &id OBJECT IDENTIFIER UNIQUE
-    }
-WITH SYNTAX
-{
-    [IS &Is]
-    [BOTH &InitiatesAndResponds]
-    [INITIATES &Initiates]
-    [RESPONDS &Responds]
-    ID &id
-    }
-
-Code ::= CHOICE
-{
-    local INTEGER,
-    global OBJECT IDENTIFIER
-    }
-
-Priority ::= INTEGER (0..MAX)
-
-ROS {InvokeId:InvokeIdSet,OPERATION:Invokable,OPERATION:Returnable} ::= CHOICE
- {
-   invoke [1] Invoke {{InvokeIdSet}, {Invokable}},
-   returnResult [2] ReturnResult {{Returnable}},
-   returnError [3] ReturnError {{Errors{{Returnable}}}},
-   reject [4] Reject
- }
-(CONSTRAINED BY {-- must conform to the above definition --}
- ! RejectProblem : general-unrecognizedPDU)
-
-Invoke {InvokeId:InvokeIdSet, OPERATION:Operations} ::= SEQUENCE
-{
-  invokeId InvokeId (InvokeIdSet)
-  (CONSTRAINED BY {-- must be unambiguous --}
-   ! RejectProblem : invoke-duplicateInvocation),
-  linkedId CHOICE {
-    present [0] IMPLICIT present < InvokeId,
-    absent [1] IMPLICIT NULL
-  }
-    (CONSTRAINED BY {-- must identify an outstanding operation --}
-    ! RejectProblem : invoke-unrecognizedLinkedId)
-    (CONSTRAINED BY {-- which has one or more linked operations--}
-    ! RejectProblem : invoke-linkedResponseUnexpected)
-    OPTIONAL,
-    opcode OPERATION.&operationCode
-    ({Operations}
-    ! RejectProblem : invoke-unrecognizedOperation),
-    argument OPERATION.&ArgumentType
-    ({Operations} {@opcode}
-    ! RejectProblem : invoke-mistypedArgument)
-    OPTIONAL
-    }
-(CONSTRAINED BY {-- must conform to the above definition --}
- ! RejectProblem : general-mistypedPDU)
-(
-WITH COMPONENTS
-{...,
-    linkedId ABSENT
-    }
-| WITH COMPONENTS
-{...,
-    linkedId PRESENT,
-    opcode
-    (CONSTRAINED BY {-- must be in the &Linked field of the associated operation --
-	}
-    ! RejectProblem : invoke-unexpectedLinkedOperation)
-    }
-)
-
-ReturnResult {OPERATION:Operations}::= SEQUENCE
-{
-    invokeId InvokeId
-    (CONSTRAINED BY {-- must be that for an outstanding operation --}
-     ! RejectProblem:returnResult-unrecognizedInvocation)
-  (CONSTRAINED BY {-- which returns a result --}
-   ! RejectProblem:returnResult-resultResponseUnexpected),
-  result SEQUENCE
-   {
-     opcode OPERATION.&operationCode
-     ({Operations})(CONSTRAINED BY {-- identified by invokeId --}
-		    ! RejectProblem:returnResult-unrecognizedInvocation),
-     result OPERATION.&ResultType     ({Operations} {@.opcode}
-	! RejectProblem:returnResult-mistypedResult)
-	}
-    OPTIONAL
-    }
-(CONSTRAINED BY {-- must conform to the above definition --
-    }
-! RejectProblem:general-mistypedPDU)
-
-ReturnError {ERROR:Errors} ::= SEQUENCE
-{
-    invokeId InvokeId
-    (CONSTRAINED BY {-- must be that for an outstanding operation --
-	}
-    ! RejectProblem : returnError-unrecognizedInvocation)
-    (CONSTRAINED BY {-- which returns an error --
-	}
-    ! RejectProblem : returnError-errorResponseUnexpected),
-    errcode ERROR.&errorCode
-    ({Errors}
-    ! RejectProblem : returnError-unrecognizedError)
-    (CONSTRAINED BY {-- must be in the &Errors field of the associated operation --
-	}
-    ! RejectProblem : returnError-unexpectedError),
-    parameter ERROR.&ParameterType
-    ({Errors}{@errcode}
-    ! RejectProblem : returnError-mistypedParameter) OPTIONAL
-    }
-(CONSTRAINED BY {-- must conform to the above definition --
-    }
-! RejectProblem : general-mistypedPDU)
-
-Reject ::= SEQUENCE
-{
-    invokeId InvokeId,
-    problem CHOICE
-    {
-	general [0] GeneralProblem,
-	invoke [1] InvokeProblem,
-	returnResult [2] ReturnResultProblem,
-	returnError [3] ReturnErrorProblem
-	}
-    }
-(CONSTRAINED BY {-- must conform to the above definition --
-    }
-! RejectProblem : general-mistypedPDU)
-
-GeneralProblem ::= INTEGER
-{
-    unrecognizedPDU (0),
-    mistypedPDU (1),
-    badlyStructuredPDU (2)
-    }
-
-InvokeProblem ::= INTEGER
-{
-    duplicateInvocation (0),
-    unrecognizedOperation (1),
-    mistypedArgument (2),
-    resourceLimitation (3),
-    releaseInProgress (4),
-    unrecognizedLinkedId (5),
-    linkedResponseUnexpected (6),
-    unexpectedLinkedOperation (7)
-    }
-
-ReturnResultProblem ::= INTEGER
-{
-    unrecognizedInvocation (0),
-    resultResponseUnexpected (1),
-    mistypedResult (2)
-    }
-
-ReturnErrorProblem ::= INTEGER
-{
-    unrecognizedInvocation (0),
-    errorResponseUnexpected (1),
-    unrecognizedError (2),
-    unexpectedError (3),
-    mistypedParameter (4)
-    }
-
-RejectProblem ::= INTEGER
-{
-    general-unrecognizedPDU (0),
-    general-mistypedPDU (1),
-    general-badlyStructuredPDU (2),
-    invoke-duplicateInvocation (10),
-    invoke-unrecognizedOperation (11),
-    invoke-mistypedArgument (12),
-    invoke-resourceLimitation (13),
-    invoke-releaseInProgress (14),
-    invoke-unrecognizedLinkedId (15),
-    invoke-linkedResponseUnexpected (16),
-    invoke-unexpectedLinkedOperation (17),
-    returnResult-unrecognizedInvocation (20),
-    returnResult-resultResponseUnexpected (21),
-    returnResult-mistypedResult (22),
-    returnError-unrecognizedInvocation (30),
-    returnError-errorResponseUnexpected (31),
-    returnError-unrecognizedError (32),
-    returnError-unexpectedError (33),
-    returnError-mistypedParameter (34)
-    }
-
-InvokeId ::= CHOICE
-{
-    present INTEGER,
-    absent NULL
-    }
-
-noInvokeId InvokeId ::= absent:NULL
-
-NoInvokeId InvokeId ::= {noInvokeId}
-
-Errors {OPERATION:Operations} ERROR ::= {Operations.&Errors}
-
-Bind {OPERATION:operation} ::= CHOICE
-{
-    bind-invoke [16] OPERATION.&ArgumentType({operation}),
-    bind-result [17] OPERATION.&ResultType ({operation}),
-    bind-error [18] OPERATION.&Errors.&ParameterType ({operation})
-    }
-
-Unbind {OPERATION:operation} ::= CHOICE
-{
-    unbind-invoke [19] OPERATION.&ArgumentType({operation}),
-    unbind-result [20] OPERATION.&ResultType ({operation}),
-    unbind-error [21] OPERATION.&Errors.&ParameterType ({operation})
-    }
-
-emptyBind OPERATION ::= {ERRORS {refuse} SYNCHRONOUS TRUE}
-
-emptyUnbind OPERATION ::= { SYNCHRONOUS TRUE }
-
-refuse ERROR ::= {CODE local:-1}
-
-no-op OPERATION ::=
- {
-   IDEMPOTENT TRUE
-   ALWAYS RESPONDS FALSE
-   CODE local:-1
- }
-
-Forward {OPERATION:OperationSet} OPERATION ::=
-{
-    OperationSet |
-    OperationSet.&Linked.&Linked |
-    OperationSet.&Linked.&Linked.&Linked.&Linked
-    }
-
-Reverse {OPERATION:OperationSet} OPERATION ::=
-{Forward{{OperationSet.&Linked}}}
-
-ConsumerPerforms {OPERATION-PACKAGE:package} OPERATION ::=
-{
-    Forward{{package.&Consumer}} |
-    Forward{{package.&Both}} |
-    Reverse{{package.&Supplier}} |
-    Reverse{{package.&Both}}
-    }
-
-SupplierPerforms {OPERATION-PACKAGE:package} OPERATION ::=
-{
-    Forward{{package.&Supplier}} |
-    Forward{{package.&Both}} |
-    Reverse{{package.&Consumer}} |
-    Reverse{{package.&Both}}
-    }
-
-AllOperations {OPERATION-PACKAGE:package} OPERATION ::=
-{
-    ConsumerPerforms {package} |
-    SupplierPerforms {package}
-    }
-
-recode {OPERATION:operation, Code:code} OPERATION ::=
-{
-    ARGUMENT operation.&ArgumentType
-    OPTIONAL operation.&argumentTypeOptional
-    RESULT operation.&ResultType
-    OPTIONAL operation.&resultTypeOptional
-    RETURN RESULT operation.&returnResult
-    ERRORS {operation.&Errors}
-    LINKED {operation.&Linked}
-    SYNCHRONOUS operation.&synchronous
-    ALWAYS RESPONDS operation.&alwaysReturns
-    INVOKE PRIORITY {operation.&InvokePriority}
-    RESULT-PRIORITY {operation.&ResultPriority}
-    CODE code
-    }
-
-switch {OPERATION-PACKAGE:package, OBJECT IDENTIFIER:id} OPERATION-PACKAGE ::=
-{
-    OPERATIONS {package.&Both}
-    CONSUMER INVOKES {package.&Consumer}
-    SUPPLIER INVOKES {package.&Supplier}
-    ID id
-    }
-
-combine {OPERATION-PACKAGE:ConsumerConsumes,OPERATION-PACKAGE:ConsumerSupplies,
-    OPERATION-PACKAGE:base
-    } OPERATION-PACKAGE ::=
-{
-    OPERATIONS {ConsumerConsumes.&Both | ConsumerSupplies.&Both}
-    CONSUMER INVOKES {ConsumerConsumes.&Consumer | ConsumerSupplies.&Supplier}
-    SUPPLIER INVOKES {ConsumerConsumes.&Supplier | ConsumerSupplies.&Consumer}
-    ID base.&id
-    }
-
-ROS-SingleAS {InvokeId:InvokeIdSet, OPERATION-PACKAGE:package} ::= ROS
-{{InvokeIdSet}, {AllOperations{package}}, {AllOperations{package}}}
-
-ROS-ConsumerAS {InvokeId:InvokeIdSet, OPERATION-PACKAGE:package} ::= ROS
-{{InvokeIdSet}, {ConsumerPerforms{package}}, {SupplierPerforms{package}}}
-
-ROS-SupplierAS {InvokeId:InvokeIdSet, OPERATION-PACKAGE:package} ::= ROS
-{{InvokeIdSet}, {SupplierPerforms{package}}, {ConsumerPerforms{package}}}
-
-probe OPERATION ::= 
- { 
-   ARGUMENT SEQUENCE 
-    { 
-      invokeId [0] InvokeId 
-    } 
-   RESULT ENUMERATED{running(0), finished(1), unknown(2), ...} 
-   IDEMPOTENT TRUE 
-   CODE local:-2 
- } 
-
-acknowledge OPERATION ::= 
- { 
-   ARGUMENT InvokeId 
-   RESULT ENUMERATED{acknowledged(0), unknown(1), ...} 
-   IDEMPOTENT TRUE 
-   CODE local:-3 
- } 
-
-ProbeAndAcknowledge OPERATION ::= {probe | acknowledge} 
-
-cancel OPERATION ::= 
- { 
-   ARGUMENT InvokeId 
-   ERRORS {cancelFailed} 
-   IDEMPOTENT TRUE 
-   CODE local:-4 
- } 
-
-cancelFailed ERROR ::= 
- { 
-   PARAMETER SET 
-    { 
-      problem [0] CancelProblem, 
-      operation [1] InvokeId 
-    } 
-   CODE local:-2 
- } 
-
-CancelProblem ::= ENUMERATED 
-{unknownOperation(0), tooLate(1), operationNotCancellable(2), ...} 
-
-cancelled ERROR ::= {CODE local:-3}
-
-END -- end of useful definitions.
diff --git a/lib/asn1/test/asn1_SUITE_data/SeqDefault.asn1 b/lib/asn1/test/asn1_SUITE_data/SeqDefault.asn1
index 99e79da972..5c8583884a 100644
--- a/lib/asn1/test/asn1_SUITE_data/SeqDefault.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/SeqDefault.asn1
@@ -74,4 +74,15 @@ SeqIn ::= SEQUENCE
   intIn  INTEGER DEFAULT 12
 }
 
+SeqExp ::= SEQUENCE
+{
+  bool BOOLEAN,
+  ...,
+  int INTEGER
+}
+
+SeqDef4 ::= SEQUENCE {
+  seq SeqExp DEFAULT { bool TRUE, int 42 }
+}
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1 b/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1
index 330944cf5c..888dbe5dd7 100644
--- a/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1
@@ -62,4 +62,13 @@ Empty ::= SEQUENCE
 {
 }
 
+SeqExt ::= SEQUENCE
+{
+  b1 BOOLEAN,
+  s1 SEQUENCE SIZE (1..3, ...) OF SeqIn,
+  b2 BOOLEAN,
+  s2 SEQUENCE SIZE (0..1024, ...) OF SeqIn,
+  magic INTEGER
+}
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/SetDefault.asn1 b/lib/asn1/test/asn1_SUITE_data/SetDefault.asn1
index cb9e0ead62..0bbe301ae7 100644
--- a/lib/asn1/test/asn1_SUITE_data/SetDefault.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/SetDefault.asn1
@@ -30,4 +30,15 @@ SetIn ::= SET
   intIn  INTEGER DEFAULT 12
 }
 
+SetDef4 ::= SET {
+  set SetExt DEFAULT { intIn 42, boolIn TRUE }
+}
+
+SetExt ::= SET
+{
+  boolIn BOOLEAN,
+  ...,
+  intIn INTEGER
+}
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/TConstr.asn1 b/lib/asn1/test/asn1_SUITE_data/TConstr.asn1
index 63f5dbde77..e2e0a11dc4 100644
--- a/lib/asn1/test/asn1_SUITE_data/TConstr.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/TConstr.asn1
@@ -51,6 +51,12 @@ Seq2 ::= SEQUENCE {
   }
 }
 
+Deeper ::= SEQUENCE {
+  a  SEQUENCE {aa INTEGER,
+               s SEQUENCE { ab MYCLASS.&id ({ObjectSet}),
+	                    ac INTEGER }},
+  b  SEQUENCE {ba INTEGER, bb MYCLASS.&Type ({ObjectSet}{@a.s.ab})}
+}
 
 -- following from Peter's definitions
 
diff --git a/lib/asn1/test/asn1_SUITE_data/Tst.py b/lib/asn1/test/asn1_SUITE_data/Tst.py
deleted file mode 100644
index d80b32dad5..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Tst.py
+++ /dev/null
@@ -1,153 +0,0 @@
-Tst { 2 6 6 24 7 1 } DEFINITIONS IMPLICIT TAGS ::=
-
-BEGIN
-
---EXPORTS SomeSet , Id0 , Aset,Id1 ,A,B,C,
---	Uhh ,Foo ,Cho,Person,Hobbe,Robbe,X,Y;
-
-IMPORTS Fooo FROM Bobby;
-
-
-Robbe ::=   SET {
-	ttt TT }
-	
-Koo ::= SET {
-	c CHOICE {
-		a INTEGER,
-		b BOOLEAN },
-	s SET OF Id0 }
-
-
-Hobbe ::= [APPLICATION 1] SET {
-	     aaa [0] SET OF INTEGER,
-	     bbb [1] UU
-	}
-
-UU ::= PP
-PP ::=   CHOICE {
-	 cc [1] CHOICE {
-		a [0] INTEGER,
-		b [1] BOOLEAN,
-		c [2] BIT STRING },
-	 ii [0] Id0
-	}
-
-
-TT ::=  SS
-SS ::=  SET {
-	b BOOLEAN DEFAULT TRUE
-	}
-
-Aset ::= [PRIVATE 2]  SET OF Uhh
-
-
-
-SomeSet ::= [PRIVATE 3]  IMPLICIT SET {
-	aaaa [2] SET{  
-		ggg [0] INTEGER},
-	kkkk [1] SET OF Id2,
-	booby [4]  OCTET STRING,
-	puck [3] INTEGER {red(0),blue(1),yellow(-2)},
-	baby [5] IMPLICIT Id1,
-	bool [6] BOOLEAN }
-
-
-Id0 ::=  INTEGER (4 .. 99)
-
-Id1 ::=   Id0
-
-Id2 ::= [PRIVATE 4] EXPLICIT Id1
-
-
-Uhh ::=  SET {
-	a [1] IMPLICIT Id1}
-
-
-
-Soon ::= [PRIVATE 5] Moon
-
-Moon ::= [PRIVATE 6] IMPLICIT Person
-
-
-Person ::= [PRIVATE 7] IMPLICIT SEQUENCE {
-	szzzs SET OF SET {
-		aaa [0] INTEGER,
-		bbb [1] Id0},
-	cho Cho,
-	name OCTET STRING ,
-	location INTEGER,
-	asss Aset,
-	oops [2] IMPLICIT SET {
-		q [0] INTEGER,
-		p [1] Uhh},
-	on INTEGER,
-	mybits [3] IMPLICIT BIT STRING,
-	foo Foo,
-	age INTEGER,
-	hobbe [5] SEQUENCE {
-		a [4] CHOICE {
-			a INTEGER,
-			b BOOLEAN },
-		b [5] Id0}}
-
-
-
-
-
-Foo ::= [PRIVATE 8] IMPLICIT SEQUENCE {
-	goofy [3]  INTEGER OPTIONAL,
-	somestring [10] IMPLICIT OCTET STRING DEFAULT '77BB'H,
-	hoohoo  [11] IMPLICIT SEQUENCE {
-		bar [1] Id1 OPTIONAL,
-		foo INTEGER, 
-		zombie [9] CHOICE {
-			a [1] IMPLICIT INTEGER,
-			b [2]  IMPLICIT BOOLEAN }
-		},
-	moon [4]  IMPLICIT INTEGER }
-
-
-
-Cho ::= [PRIVATE 9]  EXPLICIT CHOICE {
-	somestring [2] IMPLICIT OCTET STRING,
-	goofy [9]  INTEGER,
-	moon [4] IMPLICIT INTEGER } 
-
-
-A ::= [APPLICATION 2] SET {
-	ppp IA5String ,
-	a [0] INTEGER {aaa(6),bbb(77)} DEFAULT 998,
-	b [1] Id1 OPTIONAL,
-	c [2] OCTET STRING (SIZE(8)),
-	dd [3] BIT STRING DEFAULT '11001'B }
-
-B ::= [APPLICATION 3] SET {
-	ww [1] SET {
-		a A OPTIONAL,
-		goofy [3]  INTEGER OPTIONAL,
-		somestring [10] IMPLICIT OCTET STRING DEFAULT '77BB'H } 
-	}
-
-
-C::= [APPLICATION 4]  SEQUENCE OF X
-
-Y ::= OBJECT IDENTIFIER
-
-X ::= SET {
-	a NULL,
-	b GeneralString,
-	c UTCTime,
-	d VideotexString,
-	g GeneralizedTime,
-	h GraphicString,
-	i VisibleString,
-	j IA5String,
-	k PrintableString,
-	l OCTET STRING,
-	e TeletexString,
-	m  ANY,
-	n ObjectDescriptor,
-	o OBJECT IDENTIFIER,
-	f NumericString }
-
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/Two.py b/lib/asn1/test/asn1_SUITE_data/Two.py
deleted file mode 100644
index c8e6f1a55b..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/Two.py
+++ /dev/null
@@ -1,34 +0,0 @@
-Two { 1 2 3} DEFINITIONS EXPLICIT TAGS ::=
-
-BEGIN
-EXPORTS  A, D,Boo,Szz;
-
-
-
-D ::= [PRIVATE 1] SEQUENCE {
-	a INTEGER,
-	b Boo,
-	c  ANY DEFINED BY a ,
-	d ANY }
-
-
-Boo ::=  SEQUENCE OF INTEGER (198..200)
-
-A ::= [PRIVATE 2] SEQUENCE {
-	a INTEGER (1..1),
-	b INTEGER (3..3) }
-
-
-Szz ::= CHOICE {
-	one INTEGER,
-	two BOOLEAN }
-
-C ::= SET {
-	a [0] INTEGER (0..8),
-	xx [4] CHOICE {
-		[7] INTEGER (9..10),
-		a INTEGER (11 ..13) },
-	 f Boo,
- 	 r [2] INTEGER (20..22)}
-END
-
diff --git a/lib/asn1/test/asn1_SUITE_data/UPERDefault.asn b/lib/asn1/test/asn1_SUITE_data/UPERDefault.asn
deleted file mode 100644
index 7b81a0e09f..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/UPERDefault.asn
+++ /dev/null
@@ -1,18 +0,0 @@
-UPERDefault DEFINITIONS AUTOMATIC TAGS ::=
-
-BEGIN
-
--- OTP-7681
-Int ::= INTEGER (0..32767)
-
-Seq ::= SEQUENCE {
-  a Int,
-  b INTEGER (-27..27) DEFAULT 0, -- OTP-7678
-  c INTEGER OPTIONAL
-}
-
-seq Seq ::=
-{a 12,
- b 0}
-
-END
\ No newline at end of file
diff --git a/lib/asn1/test/asn1_SUITE_data/UndefType.py b/lib/asn1/test/asn1_SUITE_data/UndefType.py
deleted file mode 100644
index cdbe083803..0000000000
--- a/lib/asn1/test/asn1_SUITE_data/UndefType.py
+++ /dev/null
@@ -1,14 +0,0 @@
-Person DEFINITIONS IMPLICIT TAGS ::=
-BEGIN
-EXPORTS Person;
-IMPORTS
-	ImportedFromUndefined FROM UndefinedModule;
-
-Feltyp ::= UndefinedType
-Feltyp2 ::= ImportedFromUndefined
-Person ::= [PRIVATE 19] SEQUENCE {
-	name Undefined,
-	location INTEGER {home(0),field(1),roving(2)},
-	age ImportedFromUndefined OPTIONAL
-	}
-END
diff --git a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
index d46560979d..00e4c707dd 100644
--- a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
+++ b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
@@ -1,9 +1,3 @@
-%%%-------------------------------------------------------------------
-%%% File    : extensionAdditionGroup.erl
-%%% Author  : Kenneth Lundin
-%%% Description :
-%%%
-%%% Created : 18 May 2010 by kenneth
 %%
 %% %CopyrightBegin%
 %%
@@ -25,36 +19,38 @@
 %%%-------------------------------------------------------------------
 -module(extensionAdditionGroup).
 -include("Extension-Addition-Group.hrl").
-
+-export([run/1]).
 
 -compile(export_all).
 
 run(Erule) ->
-    Val = #'Ax'{a=253, b = true, c= {e,true}, g="123", h = true},
-    io:format("~p:~p~n",[Erule,Val]),
-    {ok,List}= asn1rt:encode('Extension-Addition-Group','Ax',Val),
-    Enc = iolist_to_binary(List),
-    io:format("~p~n",[Enc]),
-    {ok,Val2} = asn1rt:decode('Extension-Addition-Group','Ax',Enc),
-    io:format("~p~n",[Val2]),
-    case Val2 of
-	Val -> ok;
-	_ -> exit({expected,Val, got, Val2})
-    end.
+    Val = #'Ax'{a=253,b=true,c={e,true},g="123",h=true},
+    Enc = hex_to_binary(encoded_ax(Erule)),
+    roundtrip('Ax', Val, Enc),
 
-run2(Erule) ->
-    Val = #'Ax3'{a=253, b = true, s = #'Ax3_s'{sa = 11, sb = true, sextaddgroup = 17}},
-    io:format("~p:~p~n",[Erule,Val]),
-    {ok,List}= asn1rt:encode('Extension-Addition-Group','Ax3',Val),
-    Enc = iolist_to_binary(List),
-    io:format("~p~n",[Enc]),
-    {ok,Val2} = asn1rt:decode('Extension-Addition-Group','Ax3',Enc),
-    io:format("~p~n",[Val2]),
-    case Val2 of
-	Val -> ok;
-	_ -> exit({expected,Val, got, Val2})
-    end.
+    Val2 = #'Ax3'{a=253,b=true,s=#'Ax3_s'{sa=11,sb=true,sextaddgroup=17}},
+    roundtrip('Ax3', Val2),
+
+    run3(),
+    run3(Erule),
+
+    ok.
+
+%% From X.691 (07/2002) A.4.
+encoded_ax(per) ->  "9E000180 010291A4";
+encoded_ax(uper) -> "9E000600 040A4690";
+encoded_ax(ber) ->  none.
 
+hex_to_binary(none) ->
+    none;
+hex_to_binary(L) ->
+    << <<(hex_digit_to_binary(D)):4>> || D <- L, D =/= $\s >>.
+
+hex_digit_to_binary(D) ->
+    if
+	$0 =< D, D =< $9 -> D - $0;
+	$A =< D, D =< $F -> D - ($A-10)
+    end.
 run3(Erule) ->
     Val = 
 {'RRC-DL-DCCH-Message',
@@ -141,15 +137,23 @@ run3() ->
                  'ac-BarringFactor' = p00,
                  'ac-BarringTime' = s4,
                  'ac-BarringForSpecialAC' = <<0:5>>},
-    roundtrip(SI),
-    roundtrip(SI#'SystemInformationBlockType2'{
-		'ssac-BarringForMMTEL-Voice-r9'=Barring}),
-    roundtrip(SI#'SystemInformationBlockType2'{
+    T = 'SystemInformationBlockType2',
+    roundtrip(T, SI),
+    roundtrip(T, SI#'SystemInformationBlockType2'{
+		   'ssac-BarringForMMTEL-Voice-r9'=Barring}),
+    roundtrip(T, SI#'SystemInformationBlockType2'{
 		'ssac-BarringForMMTEL-Video-r9'=Barring}),
-    roundtrip(SI#'SystemInformationBlockType2'{
-		'ac-BarringForCSFB-r10'=Barring}).
+    roundtrip(T, SI#'SystemInformationBlockType2'{
+		   'ac-BarringForCSFB-r10'=Barring}).
 
-roundtrip(V) ->
+roundtrip(T, V) ->
+    roundtrip(T, V, none).
+
+roundtrip(T, V, Expected) ->
     Mod = 'Extension-Addition-Group',
-    {ok,E} = Mod:encode('SystemInformationBlockType2', V),
-    {ok,V} = Mod:decode('SystemInformationBlockType2', iolist_to_binary(E)).
+    {ok,E} = Mod:encode(T, V),
+    {ok,V} = Mod:decode(T, E),
+    case Expected of
+	none -> ok;
+	E -> ok
+    end.
diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl
index 1e40fd7b9e..b839dfcf2a 100644
--- a/lib/asn1/test/asn1_test_lib.erl
+++ b/lib/asn1/test/asn1_test_lib.erl
@@ -39,17 +39,18 @@ compile_all(Files, Config, Options) ->
 
 compile_file(File, Options) ->
     try
-        ok = asn1ct:compile(File, Options),
+        ok = asn1ct:compile(File, [warnings_as_errors|Options]),
         case should_load(File, Options) of
             false ->
                 ok;
             {module, Module} ->
                 code:purge(Module),
-                true = code:soft_purge(Module),
-                {module, Module} = code:load_file(Module)
+                {module, Module} = code:load_file(Module),
+		code:purge(Module)
         end
     catch
         Class:Reason ->
+	    ct:print("Failed to compile ~s\n", [File]),
             erlang:error({compile_failed, {File, Options}, {Class, Reason}})
     end.
 
@@ -58,7 +59,7 @@ compile_erlang(Mod, Config, Options) ->
     CaseDir = ?config(case_dir, Config),
     M = list_to_atom(Mod),
     {ok, M} = compile:file(filename:join(DataDir, Mod),
-                           [{i, CaseDir}, {outdir, CaseDir}|Options]).
+                           [report,{i,CaseDir},{outdir,CaseDir}|Options]).
 
 should_load(File, Options) ->
     case lists:member(abs, Options) of
diff --git a/lib/asn1/test/error_SUITE.erl b/lib/asn1/test/error_SUITE.erl
new file mode 100644
index 0000000000..a94a6d95a0
--- /dev/null
+++ b/lib/asn1/test/error_SUITE.erl
@@ -0,0 +1,104 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(error_SUITE).
+-export([suite/0,all/0,groups/0,
+	 already_defined/1,enumerated/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks, [ts_install_cth]}].
+
+all() ->
+    [{group,p}].
+
+groups() ->
+    [{p,parallel(),[already_defined,
+		    enumerated]}].
+
+parallel() ->
+    case erlang:system_info(schedulers) > 1 of
+        true  -> [parallel];
+        false -> []
+    end.
+
+already_defined(Config) ->
+    M = 'Already',
+    P = {M,
+	 <<"Already DEFINITIONS ::= BEGIN\n"
+	   "  I ::= INTEGER\n"
+	   "  i I ::= 42\n"
+	   "  I ::= OCTET STRING\n"
+	   "  I ::= CLASS { &Type }\n"
+	   "  MYCLASS ::= CLASS { &Type }\n"
+	   "  i MYCLASS ::= { &Type INTEGER }\n"
+	   "  o MYCLASS ::= { &Type INTEGER }\n"
+	   "  I MYCLASS ::= { o }\n"
+	   "  I{T} ::= SEQUENCE OF T\n"
+	   "  I{INTEGER:x} INTEGER ::= { 1 | 2 | x }\n"
+	   "  i{T} MYCLASS ::= { &Type T }\n"
+	   "END\n">>},
+    {error,
+     [
+      {structured_error,{M,4},asn1ct_check,{already_defined,'I',2}},
+      {structured_error,{M,5},asn1ct_check,{already_defined,'I',2}},
+      {structured_error,{M,7},asn1ct_check,{already_defined,'i',3}},
+      {structured_error,{M,9},asn1ct_check,{already_defined,'I',2}},
+      {structured_error,{M,10},asn1ct_check,{already_defined,'I',2}},
+      {structured_error,{M,11},asn1ct_check,{already_defined,'I',2}},
+      {structured_error,{M,12},asn1ct_check,{already_defined,'i',3}}
+     ]
+    } = run(P, Config),
+    ok.
+
+enumerated(Config) ->
+    M = 'Enumerated',
+    P = {M,
+	 <<"Enumerated DEFINITIONS AUTOMATIC TAGS ::= BEGIN\n"
+	   "  Enum ::= ENUMERATED { a, b, c }\n"
+	   "  e Enum ::= d\n"
+	   "  EnumExt ::= ENUMERATED { x, ..., y }\n"
+	   "  ext EnumExt ::= z\n"
+	   "  S1 ::= SEQUENCE {\n"
+           "    ge1 Enum DEFAULT a,\n"
+           "    ge2 EnumExt DEFAULT x,\n"
+           "    ge3 EnumExt DEFAULT y,\n"
+	   "    e Enum DEFAULT aa\n"
+           "  }\n"
+	   "  S2 ::= SEQUENCE {\n"
+	   "    e2 EnumExt DEFAULT xyz\n"
+	   "  }\n"
+	   "END\n">>},
+    {error,
+     [
+      {structured_error,{'Enumerated',3},asn1ct_check,{undefined,d}},
+      {structured_error,{'Enumerated',5},asn1ct_check,{undefined,z}},
+      {structured_error,{'Enumerated',10},asn1ct_check,{undefined,aa}},
+      {structured_error,{'Enumerated',13},asn1ct_check,{undefined,xyz}}
+     ]
+    } = run(P, Config),
+    ok.
+
+
+
+run({Mod,Spec}, Config) ->
+    Base = atom_to_list(Mod) ++ ".asn1",
+    File = filename:join(?config(priv_dir, Config), Base),
+    ok = file:write_file(File, Spec),
+    asn1ct:compile(File).
diff --git a/lib/asn1/test/testChoExtension.erl b/lib/asn1/test/testChoExtension.erl
index 067d4d2bf7..5c67ff62ce 100644
--- a/lib/asn1/test/testChoExtension.erl
+++ b/lib/asn1/test/testChoExtension.erl
@@ -42,6 +42,11 @@ extension(_Rules) ->
     roundtrip('ChoExt3', {int,33}),
     roundtrip('ChoExt4', {str,"abc"}),
 
+    roundtrip('ChoEmptyRoot', {bool,false}),
+    roundtrip('ChoEmptyRoot', {bool,true}),
+    roundtrip('ChoEmptyRoot', {int,0}),
+    roundtrip('ChoEmptyRoot', {int,7}),
+
     ok.
 
 
diff --git a/lib/asn1/test/testCompactBitString.erl b/lib/asn1/test/testCompactBitString.erl
index 96d9f0fdcb..28ab2464e9 100644
--- a/lib/asn1/test/testCompactBitString.erl
+++ b/lib/asn1/test/testCompactBitString.erl
@@ -150,4 +150,6 @@ roundtrip(Type, Val1, Val2) ->
 roundtrip_1(Mod, Type, In, Out) ->
     {ok,Encoded} = Mod:encode(Type, In),
     {ok,Out} = Mod:decode(Type, Encoded),
+    %% Test that compact BIT STRINGs can be encoded.
+    {ok,Encoded} = Mod:encode(Type, Out),
     ok.
diff --git a/lib/asn1/test/testConstraints.erl b/lib/asn1/test/testConstraints.erl
index c8d9008641..e825302629 100644
--- a/lib/asn1/test/testConstraints.erl
+++ b/lib/asn1/test/testConstraints.erl
@@ -122,13 +122,61 @@ int_constraints(Rules) ->
     range_error(Rules, 'X1', 21),
 
     %%==========================================================
+    %%  SemiConstrained
+    %%==========================================================
+
+    roundtrip('SemiConstrained', 100),
+    roundtrip('SemiConstrained', 397249742397243),
+    roundtrip('NegSemiConstrained', -128),
+    roundtrip('NegSemiConstrained', -1),
+    roundtrip('NegSemiConstrained', 500),
+
+    roundtrip('SemiConstrainedExt', -65536),
+    roundtrip('SemiConstrainedExt', 0),
+    roundtrip('SemiConstrainedExt', 42),
+    roundtrip('SemiConstrainedExt', 100),
+    roundtrip('SemiConstrainedExt', 47777789),
+    roundtrip('NegSemiConstrainedExt', -1023),
+    roundtrip('NegSemiConstrainedExt', -128),
+    roundtrip('NegSemiConstrainedExt', -1),
+    roundtrip('NegSemiConstrainedExt', 500),
+
+    %%==========================================================
     %%  SIZE Constraint (Duboisson p. 268)
     %%  T ::=  IA5String (SIZE (1|2, ..., SIZE (1|2|3)))
     %%  T2 ::= IA5String (SIZE (1|2, ..., 3))
     %%==========================================================
 
     roundtrip('T', "IA"),
-    roundtrip('T2', "IA").
+    roundtrip('T', "IAB"),
+    roundtrip('T', "IABC"),
+    roundtrip('T2', "IA"),
+    roundtrip('T2', "IAB"),
+    roundtrip('T2', "IABC"),
+
+    %%==========================================================
+    %%  More SIZE Constraints
+    %%==========================================================
+
+    roundtrip('FixedSize', "0123456789"),
+    roundtrip('FixedSize2', "0123456789"),
+    roundtrip('FixedSize2', "0123456789abcdefghij"),
+
+    range_error(Rules, 'FixedSize', "short"),
+    range_error(Rules, 'FixedSize2', "short"),
+
+    [roundtrip('VariableSize', lists:seq($A, $A+L-1)) ||
+	L <- lists:seq(1, 10)],
+
+    roundtrip_enc('ShorterExt', "a", shorter_ext(Rules, "a")),
+    roundtrip('ShorterExt', "abcde"),
+    roundtrip('ShorterExt', "abcdef"),
+
+    ok.
+
+shorter_ext(per, "a") -> <<16#80,16#01,16#61>>;
+shorter_ext(uper, "a") -> <<16#80,16#E1>>;
+shorter_ext(ber, _) -> none.
 
 refed_NNL_name(_Erule) ->
     ?line {ok,_} = asn1_wrapper:encode('Constraints','AnotherThing',fred),
@@ -143,11 +191,20 @@ roundtrip(Module, Type, Value) ->
     {ok,Value} = Module:decode(Type, Encoded),
     ok.
 
+roundtrip_enc(Type, Value, Enc) ->
+    Module = 'Constraints',
+    {ok,Encoded} = Module:encode(Type, Value),
+    {ok,Value} = Module:decode(Type, Encoded),
+    case Enc of
+	none -> ok;
+	Encoded -> ok
+    end.
+
 range_error(ber, Type, Value) ->
     %% BER: Values outside the effective range should be rejected
     %% on decode.
     {ok,Encoded} = 'Constraints':encode(Type, Value),
-    {error,{asn1,{integer_range,_,_}}} = 'Constraints':decode(Type, Encoded),
+    {error,{asn1,_}} = 'Constraints':decode(Type, Encoded),
     ok;
 range_error(Per, Type, Value) when Per =:= per; Per =:= uper ->
     %% (U)PER: Values outside the effective range should be rejected
diff --git a/lib/asn1/test/testDeepTConstr.erl b/lib/asn1/test/testDeepTConstr.erl
index 3df7bcbaa0..e826cafa0c 100644
--- a/lib/asn1/test/testDeepTConstr.erl
+++ b/lib/asn1/test/testDeepTConstr.erl
@@ -40,53 +40,40 @@ main(_Erule) ->
 	      {any,"DK"},
 	      {final,"NO"}]}},
 
-    ?line {ok,Bytes1} = 
-	asn1_wrapper:encode('TConstrChoice','FilterItem',Val1),
-    
-    ?line {error,Reason} = asn1_wrapper:decode('TConstrChoice','FilterItem',Bytes1),
-    
+    {ok,Bytes1} = 'TConstrChoice':encode('FilterItem', Val1),
+    {error,Reason} = asn1_wrapper:decode('TConstrChoice','FilterItem',Bytes1),
     io:format("Reason: ~p~n~n",[Reason]),
-    
-    ?line {ok,Bytes2} = 
-	asn1_wrapper:encode('TConstrChoice','FilterItem',Val2),
-    
-    ?line {ok,Res} = asn1_wrapper:decode('TConstrChoice','FilterItem',Bytes2),
-    
-
+    {ok,Bytes2} = 'TConstrChoice':encode('FilterItem', Val2),
+    {ok,Res} = 'TConstrChoice':decode('FilterItem', Bytes2),
 
     %% test of OTP-4248.
-    ?line {ok,Bytes3} =
-	asn1_wrapper:encode('TConstrChoice','Seq',{'Seq',3,Bytes2}),
-
-    ?line {ok,{'Seq',3,Bytes4}} =
-	asn1_wrapper:decode('TConstrChoice','Seq',Bytes3),
-    
-    ?line {ok,Res} = asn1_wrapper:decode('TConstrChoice','FilterItem',Bytes4),
+    {ok,Bytes3} = 'TConstrChoice':encode('Seq', {'Seq',3,Bytes2}),
+    {ok,{'Seq',3,Bytes4}} = 'TConstrChoice':decode('Seq', Bytes3),
+    {ok,Res} = 'TConstrChoice':decode('FilterItem', Bytes4),
     
     %% test of TConstr
 
-    Seq1Val = {'Seq1',{'Seq1_a',12,{2,4}},{'Seq1_b',13,{'Type-object1',14,true}}},
-    ?line {ok,Bytes5} =
-	asn1_wrapper:encode('TConstr','Seq1',Seq1Val),
-    
-    ?line {ok,Seq1Val} =
-	asn1_wrapper:decode('TConstr','Seq1',Bytes5),
+    Seq1Val = {'Seq1',{'Seq1_a',12,{2,4}},
+	       {'Seq1_b',13,{'Type-object1',14,true}}},
+    roundtrip('TConstr', 'Seq1', Seq1Val),
     
 
     Seq2Val = {'Seq2',123,{'Seq2_content',{2,6,7},
 			   {first,{'Type-object3_first',false,47}},
 			   false}},
-    
-    ?line {ok,Bytes6} =
-	asn1_wrapper:encode('TConstr','Seq2',Seq2Val),
+    roundtrip('TConstr', 'Seq2', Seq2Val),
 
-    ?line {ok,Seq2Val} =
-	asn1_wrapper:decode('TConstr','Seq2',Bytes6),
+    roundtrip('TConstr', 'Info', {'Info',{'Info_xyz',{1,2}},1234}),
+
+    roundtrip('TConstr', 'Deeper',
+	      {'Deeper',
+	       {'Deeper_a',12,
+		{'Deeper_a_s',{2,4},42}},
+	       {'Deeper_b',13,{'Type-object1',14,true}}}),
+    ok.
 
-    InfoVal = {'Info',{'Info_xyz',{1,2}},1234},
-    
-    ?line {ok,Bytes7} =
-	asn1_wrapper:encode('TConstr','Info',InfoVal),
 
-    ?line {ok,InfoVal} =
-	asn1_wrapper:decode('TConstr','Info',Bytes7).
+roundtrip(M, T, V) ->
+    {ok,E} = M:encode(T, V),
+    {ok,V} = M:decode(T, E),
+    ok.
diff --git a/lib/asn1/test/testEnumExt.erl b/lib/asn1/test/testEnumExt.erl
index 0811f20571..8840ed6d2f 100644
--- a/lib/asn1/test/testEnumExt.erl
+++ b/lib/asn1/test/testEnumExt.erl
@@ -38,8 +38,7 @@ main(Rule) when Rule =:= per; Rule =:= uper ->
     %% ENUMERATED no extensionmark 
     B64 = <<64>>,
     B64 = roundtrip('Noext', red),
-    ok;
-
+    common();
 main(ber) ->
     io:format("main(ber)~n",[]),
     %% ENUMERATED with extensionmark (value is in root set)
@@ -57,6 +56,15 @@ main(ber) ->
     roundtrip('Globalstate', preop),
     roundtrip('Globalstate', com),
 
+    common().
+
+common() ->
+    roundtrip('Seq', {'Seq',blue,42}),
+    roundtrip('Seq', {'Seq',red,42}),
+    roundtrip('Seq', {'Seq',green,42}),
+    roundtrip('Seq', {'Seq',orange,47}),
+    roundtrip('Seq', {'Seq',black,4711}),
+    roundtrip('Seq', {'Seq',magenta,4712}),
     ok.
 
 roundtrip(Type, Value) ->
diff --git a/lib/asn1/test/testInfObj.erl b/lib/asn1/test/testInfObj.erl
index 03e70c730a..75f4dae310 100644
--- a/lib/asn1/test/testInfObj.erl
+++ b/lib/asn1/test/testInfObj.erl
@@ -22,8 +22,6 @@
 
 -export([main/1]).
 
--include_lib("test_server/include/test_server.hrl").
-
 -record('InitiatingMessage',{procedureCode,criticality,value}).
 -record('InitiatingMessage2',{procedureCode,criticality,value}).
 -record('Iu-ReleaseCommand',{first,second}).
@@ -34,22 +32,11 @@ main(_Erule) ->
 				value=#'Iu-ReleaseCommand'{
 				  first=13,
 				  second=true}},
-    ?line {ok,Bytes1} = 
-	asn1_wrapper:encode('RANAPextract1','InitiatingMessage',Val1),
-    
-    ?line {ok,{'InitiatingMessage',1,ignore,{'Iu-ReleaseCommand',13,true}}}=
-	asn1_wrapper:decode('RANAPextract1','InitiatingMessage',Bytes1),
-    
-    ?line {ok,Bytes2} =
-	asn1_wrapper:encode('InfObj','InitiatingMessage',Val1),
-    
-    ?line {ok,Val1} =
-	asn1_wrapper:decode('InfObj','InitiatingMessage',Bytes2),
+    roundtrip('RANAPextract1', 'InitiatingMessage', Val1),
+    roundtrip('InfObj', 'InitiatingMessage', Val1),
 
     Val2 = Val1#'InitiatingMessage'{procedureCode=2},
-    
-    ?line {error,_R1} =
-	asn1_wrapper:encode('InfObj','InitiatingMessage',Val2),
+    {error,_R1} = 'InfObj':encode('InitiatingMessage', Val2),
     
 
     %% Test case for OTP-4275
@@ -59,10 +46,26 @@ main(_Erule) ->
 				   first=13,
 				   second=true}},
 
-    ?line {ok,Bytes3} = 
-	asn1_wrapper:encode('RANAPextract1','InitiatingMessage2',Val3),
+    roundtrip('RANAPextract1', 'InitiatingMessage2', Val3),
 
-    
-    ?line {ok,{'InitiatingMessage2',3,reject,{'Iu-ReleaseCommand',13,true}}}=
-	asn1_wrapper:decode('RANAPextract1','InitiatingMessage2',Bytes3).
-    
+    roundtrip('InfObj', 'MyPdu', {'MyPdu',42,12,false,"string"}),
+    roundtrip('InfObj', 'MyPdu', {'MyPdu',{'Seq',1023,"hello"},
+				  42,true,"longer string"}),
+    roundtrip('InfObj', 'MyPdu', {'MyPdu',"75712346",43,true,"string"}),
+
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',1,{'CONSTRUCTED-DEFAULT_Type',-2001,true}}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',2,{'CONSTRUCTED-DEFAULT_Type',999,false}}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',3,true}),
+
+    roundtrip('InfObj', 'Seq2',
+	      {'Seq2',42,[true,false,false,true],
+	       [false,true,false]}).
+
+
+roundtrip(M, T, V) ->
+    {ok,Enc} = M:encode(T, V),
+    {ok,V} = M:decode(T, Enc),
+    ok.
diff --git a/lib/asn1/test/testPrim.erl b/lib/asn1/test/testPrim.erl
index 91fb9fffca..990e7adcd9 100644
--- a/lib/asn1/test/testPrim.erl
+++ b/lib/asn1/test/testPrim.erl
@@ -30,465 +30,57 @@
 -include_lib("test_server/include/test_server.hrl").
 
 bool(Rules) ->
-
-    %%==========================================================
-    %% Bool ::=  BOOLEAN 
-    %%==========================================================
-
-    ?line {ok,Bytes1} = asn1_wrapper:encode('Prim','Bool',true),
-    ?line {ok,true} = asn1_wrapper:decode('Prim','Bool',lists:flatten(Bytes1)),
-
-    ?line {ok,Bytes2} = asn1_wrapper:encode('Prim','Bool',false),
-    ?line {ok,false} = asn1_wrapper:decode('Prim','Bool',lists:flatten(Bytes2)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {error,{asn1,{encode_boolean,517}}} = 
-		      (catch asn1_wrapper:encode('Prim','Bool',517)),
-		  ok;
-	      per ->
-		  ok
-	  end,
-
-    
-
-
-
-    %%==========================================================
-    %% BoolCon ::=  [20] BOOLEAN 
-    %%==========================================================
-
-
-    ?line {ok,BytesCon1} = asn1_wrapper:encode('Prim','BoolCon',true),
-    ?line {ok,true} = asn1_wrapper:decode('Prim','BoolCon',lists:flatten(BytesCon1)),
-
-    ?line {ok,BytesCon2} = asn1_wrapper:encode('Prim','BoolCon',false),
-    ?line {ok,false} = asn1_wrapper:decode('Prim','BoolCon',lists:flatten(BytesCon2)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {error,{asn1,{encode_boolean,517}}} = 
-		      (catch asn1_wrapper:encode('Prim','BoolCon',517)),
-		  ok;
-	      per ->
-		  ok
-	  end,
-    
-
-
-
-
-    %%==========================================================
-    %% BoolPri ::=  [PRIVATE 21] BOOLEAN 
-    %%==========================================================
-
-    ?line {ok,BytesPri1} = asn1_wrapper:encode('Prim','BoolPri',true),
-    ?line {ok,true} = asn1_wrapper:decode('Prim','BoolPri',lists:flatten(BytesPri1)),
-
-    ?line {ok,BytesPri2} = asn1_wrapper:encode('Prim','BoolPri',false),
-    ?line {ok,false} = asn1_wrapper:decode('Prim','BoolPri',lists:flatten(BytesPri2)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {error,{asn1,{encode_boolean,517}}} = 
-		      (catch asn1_wrapper:encode('Prim','BoolPri',517)),
-		  ok;
-	      per ->
-		  ok
-	  end,
-
-
-    %%==========================================================
-    %% BoolApp ::=  [APPLICATION 22] BOOLEAN 
-    %%==========================================================
-
-    ?line {ok,BytesApp1} = asn1_wrapper:encode('Prim','BoolApp',true),
-    ?line {ok,true} = asn1_wrapper:decode('Prim','BoolApp',lists:flatten(BytesApp1)),
-
-    ?line {ok,BytesApp2} = asn1_wrapper:encode('Prim','BoolApp',false),
-    ?line {ok,false} = asn1_wrapper:decode('Prim','BoolApp',lists:flatten(BytesApp2)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {error,{asn1,{encode_boolean,517}}} = 
-		      (catch asn1_wrapper:encode('Prim','BoolApp',517)),
-		  ok;
-	      per ->
-		  ok
-	  end,
-
-
-    %%==========================================================
-    %% BoolExpCon ::=  [30] EXPLICIT BOOLEAN 
-    %%==========================================================
-
-    ?line {ok,BytesExpCon1} = asn1_wrapper:encode('Prim','BoolExpCon',true),
-    ?line {ok,true} = asn1_wrapper:decode('Prim','BoolExpCon',lists:flatten(BytesExpCon1)),
-
-    ?line {ok,BytesExpCon2} = asn1_wrapper:encode('Prim','BoolExpCon',false),
-    ?line {ok,false} = asn1_wrapper:decode('Prim','BoolExpCon',lists:flatten(BytesExpCon2)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {error,{asn1,{encode_boolean,517}}} = 
-		      (catch asn1_wrapper:encode('Prim','BoolExpCon',517)),
-		  ok;
-	      per ->
-		  ok
-	  end,
-
-
-
-    %%==========================================================
-    %% BoolExpPri ::=  [PRIVATE 31] EXPLICIT BOOLEAN 
-    %%==========================================================
-
-    ?line {ok,BytesExpPri1} = asn1_wrapper:encode('Prim','BoolExpPri',true),
-    ?line {ok,true} = asn1_wrapper:decode('Prim','BoolExpPri',lists:flatten(BytesExpPri1)),
-
-    ?line {ok,BytesExpPri2} = asn1_wrapper:encode('Prim','BoolExpPri',false),
-    ?line {ok,false} = asn1_wrapper:decode('Prim','BoolExpPri',lists:flatten(BytesExpPri2)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {error,{asn1,{encode_boolean,517}}} = 
-		      (catch asn1_wrapper:encode('Prim','BoolExpPri',517)),
-		  ok;
-	      per ->
-		  ok
-	  end,
-
-
-    %%==========================================================
-    %% BoolExpApp ::=  [APPLICATION 32] EXPLICIT BOOLEAN 
-    %%==========================================================
-
-    ?line {ok,BytesExpApp1} = asn1_wrapper:encode('Prim','BoolExpApp',true),
-    ?line {ok,true} = asn1_wrapper:decode('Prim','BoolExpApp',lists:flatten(BytesExpApp1)),
-
-    ?line {ok,BytesExpApp2} = asn1_wrapper:encode('Prim','BoolExpApp',false),
-    ?line {ok,false} = asn1_wrapper:decode('Prim','BoolExpApp',lists:flatten(BytesExpApp2)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {error,{asn1,{encode_boolean,517}}} = 
-		      (catch asn1_wrapper:encode('Prim','BoolExpApp',517)),
-		  ok;
-	      per ->
-		  ok
-	  end,
-
-    ok.
+    Types = ['Bool','BoolCon','BoolPri','BoolApp',
+	     'BoolExpCon','BoolExpPri','BoolExpApp'],
+    [roundtrip(T, V) || T <- Types, V <- [true,false]],
+    case Rules of
+	ber ->
+	    [begin
+		 {error,{asn1,{encode_boolean,517}}} =
+		     (catch 'Prim':encode(T, 517))
+	     end || T <- Types],
+	    ok;
+	_ ->
+	    ok
+    end.
 
 
 int(Rules) ->
-
-
-    %%==========================================================
-    %% Int ::=  INTEGER 
-    %%==========================================================
-
-    %% test of OTP-2666 encoding should use minimum number of octets x.690 8.3.2
-    ?line {ok,Bytes0} = asn1_wrapper:encode('Prim','Int',-128),
-    ?line L0 = lists:flatten(Bytes0),
-    ?line {ok,-128} = asn1_wrapper:decode('Prim','Int',lists:flatten(L0)),
-    case asn1_wrapper:erule(Rules) of
+    %% OTP-2666: encoding should use minimum number of octets; x.690 8.3.2
+    Bytes0 = roundtrip('Int', -128),
+    case Rules of
 	ber ->
-	    ?line [_,1,128] = L0;
-	per -> ok
+	    <<_,1,128>> = Bytes0;
+	_ ->
+	    ok
     end,
 
-    ?line {ok,Bytes1} = asn1_wrapper:encode('Prim','Int',4),
-    ?line {ok,4} = asn1_wrapper:decode('Prim','Int',lists:flatten(Bytes1)),
-
-    ?line {ok,Bytes2} = asn1_wrapper:encode('Prim','Int',444),
-    ?line {ok,444} = asn1_wrapper:decode('Prim','Int',lists:flatten(Bytes2)),
-
-    ?line {ok,Bytes3} = asn1_wrapper:encode('Prim','Int',123456789),
-    ?line {ok,123456789} = asn1_wrapper:decode('Prim','Int',lists:flatten(Bytes3)),
-
-    ?line {ok,Bytes4} = asn1_wrapper:encode('Prim','Int',12345678901234567890),
-    ?line {ok,12345678901234567890} = asn1_wrapper:decode('Prim','Int',lists:flatten(Bytes4)),
-
-    ?line {ok,Bytes5} = asn1_wrapper:encode('Prim','Int',-100),
-    ?line {ok,-100} = asn1_wrapper:decode('Prim','Int',lists:flatten(Bytes5)),
-
-    ?line {ok,Bytes6} = asn1_wrapper:encode('Prim','Int',-255),
-    ?line {ok,-255} = asn1_wrapper:decode('Prim','Int',lists:flatten(Bytes6)),
-
-    ?line {ok,Bytes7} = asn1_wrapper:encode('Prim','Int',-256),
-    ?line {ok,-256} = asn1_wrapper:decode('Prim','Int',lists:flatten(Bytes7)),
-
-    ?line {ok,Bytes8} = asn1_wrapper:encode('Prim','Int',-257),
-    ?line {ok,-257} = asn1_wrapper:decode('Prim','Int',lists:flatten(Bytes8)),
-
-    ?line {ok,Bytes9} = asn1_wrapper:encode('Prim','Int',-1234567890),
-    ?line {ok,-1234567890} = asn1_wrapper:decode('Prim','Int',lists:flatten(Bytes9)),
-
-    ?line {ok,Bytes10} = asn1_wrapper:encode('Prim','Int',-2147483648),
-    ?line {ok,-2147483648} = asn1_wrapper:decode('Prim','Int',lists:flatten(Bytes10)),
-
-
-
-
-
-    %%==========================================================
-    %% IntCon ::=  [40] INTEGER 
-    %%==========================================================
-
-    ?line {ok,BytesCon1} = asn1_wrapper:encode('Prim','IntCon',4),
-    ?line {ok,4} = asn1_wrapper:decode('Prim','IntCon',lists:flatten(BytesCon1)),
-
-    ?line {ok,BytesCon2} = asn1_wrapper:encode('Prim','IntCon',444),
-    ?line {ok,444} = asn1_wrapper:decode('Prim','IntCon',lists:flatten(BytesCon2)),
-
-    ?line {ok,BytesCon3} = asn1_wrapper:encode('Prim','IntCon',123456789),
-    ?line {ok,123456789} = asn1_wrapper:decode('Prim','IntCon',lists:flatten(BytesCon3)),
-
-    ?line {ok,BytesCon4} = asn1_wrapper:encode('Prim','IntCon',12345678901234567890),
-    ?line {ok,12345678901234567890} = asn1_wrapper:decode('Prim','IntCon',lists:flatten(BytesCon4)),
-
-    ?line {ok,BytesCon5} = asn1_wrapper:encode('Prim','IntCon',-100),
-    ?line {ok,-100} = asn1_wrapper:decode('Prim','IntCon',lists:flatten(BytesCon5)),
-
-    ?line {ok,BytesCon6} = asn1_wrapper:encode('Prim','IntCon',-255),
-    ?line {ok,-255} = asn1_wrapper:decode('Prim','IntCon',lists:flatten(BytesCon6)),
-
-    ?line {ok,BytesCon7} = asn1_wrapper:encode('Prim','IntCon',-256),
-    ?line {ok,-256} = asn1_wrapper:decode('Prim','IntCon',lists:flatten(BytesCon7)),
-
-    ?line {ok,BytesCon8} = asn1_wrapper:encode('Prim','IntCon',-257),
-    ?line {ok,-257} = asn1_wrapper:decode('Prim','IntCon',lists:flatten(BytesCon8)),
-
-    ?line {ok,BytesCon9} = asn1_wrapper:encode('Prim','IntCon',-1234567890),
-    ?line {ok,-1234567890} = asn1_wrapper:decode('Prim','IntCon',lists:flatten(BytesCon9)),
-
-    ?line {ok,BytesCon10} = asn1_wrapper:encode('Prim','Int',-2147483648),
-    ?line {ok,-2147483648} = asn1_wrapper:decode('Prim','Int',lists:flatten(BytesCon10)),
-
-
-
-    %%==========================================================
-    %% IntPri ::=  [PRIVATE 41] INTEGER 
-    %%==========================================================
-
-    ?line {ok,BytesPri1} = asn1_wrapper:encode('Prim','IntPri',4),
-    ?line {ok,4} = asn1_wrapper:decode('Prim','IntPri',lists:flatten(BytesPri1)),
-
-    ?line {ok,BytesPri2} = asn1_wrapper:encode('Prim','IntPri',444),
-    ?line {ok,444} = asn1_wrapper:decode('Prim','IntPri',lists:flatten(BytesPri2)),
-
-    ?line {ok,BytesPri3} = asn1_wrapper:encode('Prim','IntPri',123456789),
-    ?line {ok,123456789} = asn1_wrapper:decode('Prim','IntPri',lists:flatten(BytesPri3)),
-
-    ?line {ok,BytesPri4} = asn1_wrapper:encode('Prim','IntPri',12345678901234567890),
-    ?line {ok,12345678901234567890} = asn1_wrapper:decode('Prim','IntPri',lists:flatten(BytesPri4)),
-
-    ?line {ok,BytesPri5} = asn1_wrapper:encode('Prim','IntPri',-100),
-    ?line {ok,-100} = asn1_wrapper:decode('Prim','IntPri',lists:flatten(BytesPri5)),
-
-    ?line {ok,BytesPri6} = asn1_wrapper:encode('Prim','IntPri',-255),
-    ?line {ok,-255} = asn1_wrapper:decode('Prim','IntPri',lists:flatten(BytesPri6)),
-
-    ?line {ok,BytesPri7} = asn1_wrapper:encode('Prim','IntPri',-256),
-    ?line {ok,-256} = asn1_wrapper:decode('Prim','IntPri',lists:flatten(BytesPri7)),
-
-    ?line {ok,BytesPri8} = asn1_wrapper:encode('Prim','IntPri',-257),
-    ?line {ok,-257} = asn1_wrapper:decode('Prim','IntPri',lists:flatten(BytesPri8)),
-
-    ?line {ok,BytesPri9} = asn1_wrapper:encode('Prim','IntPri',-1234567890),
-    ?line {ok,-1234567890} = asn1_wrapper:decode('Prim','IntPri',lists:flatten(BytesPri9)),
-
-    ?line {ok,BytesPri10} = asn1_wrapper:encode('Prim','Int',-2147483648),
-    ?line {ok,-2147483648} = asn1_wrapper:decode('Prim','Int',lists:flatten(BytesPri10)),
-
-
-
-    %%==========================================================
-    %% IntApp ::=  [APPLICATION 42] INTEGER 
-    %%==========================================================
-
-    ?line {ok,BytesApp1} = asn1_wrapper:encode('Prim','IntApp',4),
-    ?line {ok,4} = asn1_wrapper:decode('Prim','IntApp',lists:flatten(BytesApp1)),
-
-    ?line {ok,BytesApp2} = asn1_wrapper:encode('Prim','IntApp',444),
-    ?line {ok,444} = asn1_wrapper:decode('Prim','IntApp',lists:flatten(BytesApp2)),
-
-    ?line {ok,BytesApp3} = asn1_wrapper:encode('Prim','IntApp',123456789),
-    ?line {ok,123456789} = asn1_wrapper:decode('Prim','IntApp',lists:flatten(BytesApp3)),
-
-    ?line {ok,BytesApp4} = asn1_wrapper:encode('Prim','IntApp',12345678901234567890),
-    ?line {ok,12345678901234567890} = asn1_wrapper:decode('Prim','IntApp',lists:flatten(BytesApp4)),
-
-    ?line {ok,BytesApp5} = asn1_wrapper:encode('Prim','IntApp',-100),
-    ?line {ok,-100} = asn1_wrapper:decode('Prim','IntApp',lists:flatten(BytesApp5)),
-
-    ?line {ok,BytesApp6} = asn1_wrapper:encode('Prim','IntApp',-255),
-    ?line {ok,-255} = asn1_wrapper:decode('Prim','IntApp',lists:flatten(BytesApp6)),
-
-    ?line {ok,BytesApp7} = asn1_wrapper:encode('Prim','IntApp',-256),
-    ?line {ok,-256} = asn1_wrapper:decode('Prim','IntApp',lists:flatten(BytesApp7)),
-
-    ?line {ok,BytesApp8} = asn1_wrapper:encode('Prim','IntApp',-257),
-    ?line {ok,-257} = asn1_wrapper:decode('Prim','IntApp',lists:flatten(BytesApp8)),
-
-    ?line {ok,BytesApp9} = asn1_wrapper:encode('Prim','IntApp',-1234567890),
-    ?line {ok,-1234567890} = asn1_wrapper:decode('Prim','IntApp',lists:flatten(BytesApp9)),
-
-    ?line {ok,BytesApp10} = asn1_wrapper:encode('Prim','Int',-2147483648),
-    ?line {ok,-2147483648} = asn1_wrapper:decode('Prim','Int',lists:flatten(BytesApp10)),
-
-
-    %%==========================================================
-    %% IntExpCon ::=  [50] EXPLICIT INTEGER 
-    %%==========================================================
-
-    ?line {ok,BytesExpCon1} = asn1_wrapper:encode('Prim','IntExpCon',4),
-    ?line {ok,4} = asn1_wrapper:decode('Prim','IntExpCon',lists:flatten(BytesExpCon1)),
-
-    ?line {ok,BytesExpCon2} = asn1_wrapper:encode('Prim','IntExpCon',444),
-    ?line {ok,444} = asn1_wrapper:decode('Prim','IntExpCon',lists:flatten(BytesExpCon2)),
-
-    ?line {ok,BytesExpCon3} = asn1_wrapper:encode('Prim','IntExpCon',123456789),
-    ?line {ok,123456789} = asn1_wrapper:decode('Prim','IntExpCon',lists:flatten(BytesExpCon3)),
-
-    ?line {ok,BytesExpCon4} = asn1_wrapper:encode('Prim','IntExpCon',12345678901234567890),
-    ?line {ok,12345678901234567890} = asn1_wrapper:decode('Prim','IntExpCon',lists:flatten(BytesExpCon4)),
-
-    ?line {ok,BytesExpCon5} = asn1_wrapper:encode('Prim','IntExpCon',-100),
-    ?line {ok,-100} = asn1_wrapper:decode('Prim','IntExpCon',lists:flatten(BytesExpCon5)),
-
-    ?line {ok,BytesExpCon6} = asn1_wrapper:encode('Prim','IntExpCon',-255),
-    ?line {ok,-255} = asn1_wrapper:decode('Prim','IntExpCon',lists:flatten(BytesExpCon6)),
-
-    ?line {ok,BytesExpCon7} = asn1_wrapper:encode('Prim','IntExpCon',-256),
-    ?line {ok,-256} = asn1_wrapper:decode('Prim','IntExpCon',lists:flatten(BytesExpCon7)),
-
-    ?line {ok,BytesExpCon8} = asn1_wrapper:encode('Prim','IntExpCon',-257),
-    ?line {ok,-257} = asn1_wrapper:decode('Prim','IntExpCon',lists:flatten(BytesExpCon8)),
-
-    ?line {ok,BytesExpCon9} = asn1_wrapper:encode('Prim','IntExpCon',-1234567890),
-    ?line {ok,-1234567890} = asn1_wrapper:decode('Prim','IntExpCon',lists:flatten(BytesExpCon9)),
-
-    ?line {ok,BytesExpCon10} = asn1_wrapper:encode('Prim','Int',-2147483648),
-    ?line {ok,-2147483648} = asn1_wrapper:decode('Prim','Int',lists:flatten(BytesExpCon10)),
-
-    %%==========================================================
-    %% IntExpPri ::=  [PRIVATE 51] EXPLICIT INTEGER 
-    %%==========================================================
-
-    ?line {ok,BytesExpPri1} = asn1_wrapper:encode('Prim','IntExpPri',4),
-    ?line {ok,4} = asn1_wrapper:decode('Prim','IntExpPri',lists:flatten(BytesExpPri1)),
-
-    ?line {ok,BytesExpPri2} = asn1_wrapper:encode('Prim','IntExpPri',444),
-    ?line {ok,444} = asn1_wrapper:decode('Prim','IntExpPri',lists:flatten(BytesExpPri2)),
-
-    ?line {ok,BytesExpPri3} = asn1_wrapper:encode('Prim','IntExpPri',123456789),
-    ?line {ok,123456789} = asn1_wrapper:decode('Prim','IntExpPri',lists:flatten(BytesExpPri3)),
-
-    ?line {ok,BytesExpPri4} = asn1_wrapper:encode('Prim','IntExpPri',12345678901234567890),
-    ?line {ok,12345678901234567890} = asn1_wrapper:decode('Prim','IntExpPri',lists:flatten(BytesExpPri4)),
-
-    ?line {ok,BytesExpPri5} = asn1_wrapper:encode('Prim','IntExpPri',-100),
-    ?line {ok,-100} = asn1_wrapper:decode('Prim','IntExpPri',lists:flatten(BytesExpPri5)),
-
-    ?line {ok,BytesExpPri6} = asn1_wrapper:encode('Prim','IntExpPri',-255),
-    ?line {ok,-255} = asn1_wrapper:decode('Prim','IntExpPri',lists:flatten(BytesExpPri6)),
-
-    ?line {ok,BytesExpPri7} = asn1_wrapper:encode('Prim','IntExpPri',-256),
-    ?line {ok,-256} = asn1_wrapper:decode('Prim','IntExpPri',lists:flatten(BytesExpPri7)),
-
-    ?line {ok,BytesExpPri8} = asn1_wrapper:encode('Prim','IntExpPri',-257),
-    ?line {ok,-257} = asn1_wrapper:decode('Prim','IntExpPri',lists:flatten(BytesExpPri8)),
-
-    ?line {ok,BytesExpPri9} = asn1_wrapper:encode('Prim','IntExpPri',-1234567890),
-    ?line {ok,-1234567890} = asn1_wrapper:decode('Prim','IntExpPri',lists:flatten(BytesExpPri9)),
-
-    ?line {ok,BytesExpPri10} = asn1_wrapper:encode('Prim','Int',-2147483648),
-    ?line {ok,-2147483648} = asn1_wrapper:decode('Prim','Int',lists:flatten(BytesExpPri10)),
-
-    %%==========================================================
-    %% IntExpApp ::=  [APPLICATION 52] EXPLICIT INTEGER 
-    %%==========================================================
-
-    ?line {ok,BytesExpApp1} = asn1_wrapper:encode('Prim','IntExpApp',4),
-    ?line {ok,4} = asn1_wrapper:decode('Prim','IntExpApp',lists:flatten(BytesExpApp1)),
-
-    ?line {ok,BytesExpApp2} = asn1_wrapper:encode('Prim','IntExpApp',444),
-    ?line {ok,444} = asn1_wrapper:decode('Prim','IntExpApp',lists:flatten(BytesExpApp2)),
-
-    ?line {ok,BytesExpApp3} = asn1_wrapper:encode('Prim','IntExpApp',123456789),
-    ?line {ok,123456789} = asn1_wrapper:decode('Prim','IntExpApp',lists:flatten(BytesExpApp3)),
-
-    ?line {ok,BytesExpApp4} = asn1_wrapper:encode('Prim','IntExpApp',12345678901234567890),
-    ?line {ok,12345678901234567890} = asn1_wrapper:decode('Prim','IntExpApp',lists:flatten(BytesExpApp4)),
-
-    ?line {ok,BytesExpApp5} = asn1_wrapper:encode('Prim','IntExpApp',-100),
-    ?line {ok,-100} = asn1_wrapper:decode('Prim','IntExpApp',lists:flatten(BytesExpApp5)),
-
-    ?line {ok,BytesExpApp6} = asn1_wrapper:encode('Prim','IntExpApp',-255),
-    ?line {ok,-255} = asn1_wrapper:decode('Prim','IntExpApp',lists:flatten(BytesExpApp6)),
-
-    ?line {ok,BytesExpApp7} = asn1_wrapper:encode('Prim','IntExpApp',-256),
-    ?line {ok,-256} = asn1_wrapper:decode('Prim','IntExpApp',lists:flatten(BytesExpApp7)),
-
-    ?line {ok,BytesExpApp8} = asn1_wrapper:encode('Prim','IntExpApp',-257),
-    ?line {ok,-257} = asn1_wrapper:decode('Prim','IntExpApp',lists:flatten(BytesExpApp8)),
-
-    ?line {ok,BytesExpApp9} = asn1_wrapper:encode('Prim','IntExpApp',-1234567890),
-    ?line {ok,-1234567890} = asn1_wrapper:decode('Prim','IntExpApp',lists:flatten(BytesExpApp9)),
-
-    ?line {ok,BytesExpApp10} = asn1_wrapper:encode('Prim','Int',-2147483648),
-    ?line {ok,-2147483648} = asn1_wrapper:decode('Prim','Int',lists:flatten(BytesExpApp10)),
-
+    Values = [0,2,3,4,127,128,254,255,256,257,444,
+	      16383,16384,16385,65534,65535,65536,65537,
+	      123456789,12345678901234567890,
+	      -1,-2,-3,-4,-100,-127,-255,-256,-257,
+	      -1234567890,-2147483648],
+    [roundtrip(T, V) ||
+	T <- ['Int','IntCon','IntPri','IntApp',
+	      'IntExpCon','IntExpPri','IntExpApp'],
+	V <- [1|Values]],
 
     %%==========================================================
     %% IntEnum ::=  INTEGER {first(1),last(31)} 
     %%==========================================================
 
-    ?line {ok,BytesEnum1} = asn1_wrapper:encode('Prim','IntEnum',4),
-    ?line {ok,4} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum1)),
-
-    ?line {ok,BytesEnum2} = asn1_wrapper:encode('Prim','IntEnum',444),
-    ?line {ok,444} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum2)),
-
-    ?line {ok,BytesEnum3} = asn1_wrapper:encode('Prim','IntEnum',123456789),
-    ?line {ok,123456789} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum3)),
-
-    ?line {ok,BytesEnum4} = asn1_wrapper:encode('Prim','IntEnum',12345678901234567890),
-    ?line {ok,12345678901234567890} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum4)),
+    [roundtrip('IntEnum', V) || V <- Values],
 
-    ?line {ok,BytesEnum5} = asn1_wrapper:encode('Prim','IntEnum',-100),
-    ?line {ok,-100} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum5)),
-
-    ?line {ok,BytesEnum6} = asn1_wrapper:encode('Prim','IntEnum',-255),
-    ?line {ok,-255} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum6)),
-
-    ?line {ok,BytesEnum7} = asn1_wrapper:encode('Prim','IntEnum',-256),
-    ?line {ok,-256} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum7)),
-
-    ?line {ok,BytesEnum8} = asn1_wrapper:encode('Prim','IntEnum',-257),
-    ?line {ok,-257} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum8)),
-
-    ?line {ok,BytesEnum9} = asn1_wrapper:encode('Prim','IntEnum',-1234567890),
-    ?line {ok,-1234567890} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum9)),
-
-    ?line {ok,BytesEnum910} = asn1_wrapper:encode('Prim','Int',-2147483648),
-    ?line {ok,-2147483648} = asn1_wrapper:decode('Prim','Int',lists:flatten(BytesEnum910)),
-
-
-    ?line {ok,BytesEnum10} = asn1_wrapper:encode('Prim','IntEnum',first),
-    ?line {ok,first} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum10)),
-
-    ?line {ok,BytesEnum11} = asn1_wrapper:encode('Prim','IntEnum',last),
-    ?line {ok,last} = asn1_wrapper:decode('Prim','IntEnum',lists:flatten(BytesEnum11)),
-    
+    roundtrip('IntEnum', first),
+    roundtrip('IntEnum', last),
 
+    roundtrip('ASeq', {'ASeq',true,254,false,255,true,256,true,68789}),
+    roundtrip('ASeq', {'ASeq',false,250,true,200,true,199,true,77788}),
+    roundtrip('ASeq', {'ASeq',true,0,false,0,true,0,true,68789}),
 
     ok.
 
 
-
 enum(Rules) ->
 
     %%==========================================================
@@ -496,23 +88,9 @@ enum(Rules) ->
     %%                       friday(5),saturday(6),sunday(7)}
     %%==========================================================
 
-    ?line {ok,BytesEnum1} = asn1_wrapper:encode('Prim','Enum',monday),
-    ?line {ok,monday} = asn1_wrapper:decode('Prim','Enum',lists:flatten(BytesEnum1)),
-
-    ?line {ok,BytesEnum2} = asn1_wrapper:encode('Prim','Enum',thursday),
-    ?line {ok,thursday} = asn1_wrapper:decode('Prim','Enum',lists:flatten(BytesEnum2)),
-
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {error,{asn1,{_,4}}} = 
-		      case catch asn1_wrapper:encode('Prim','Enum',4) of Enum -> Enum end,
-		  ok;
-	      per ->
-		  ?line {error,{asn1,{_,4}}} = 
-		      case catch asn1_wrapper:encode('Prim','Enum',4) of Enum -> Enum end,
-		  ok
-	  end,
+    roundtrip('Enum', monday),
+    roundtrip('Enum', thursday),
+    {error,{asn1,{_,4}}} = (catch 'Prim':encode('Enum', 4)),
 
     case Rules of
 	Per when Per =:= per; Per =:= uper ->
@@ -524,88 +102,41 @@ enum(Rules) ->
     ok.
 
 
-
-obj_id(Rules) ->
+obj_id(_) ->
 
     %%==========================================================
     %% ObjId ::= OBJECT IDENTIFIER
     %%==========================================================
 
-    ?line {ok,Bytes1} = asn1_wrapper:encode('Prim','ObjId',{0,22,3}),
-    ?line {ok,{0,22,3}} = asn1_wrapper:decode('Prim','ObjId',lists:flatten(Bytes1)),
-
-    ?line {ok,Bytes2} = asn1_wrapper:encode('Prim','ObjId',{1,39,3}),
-    ?line {ok,{1,39,3}} = asn1_wrapper:decode('Prim','ObjId',lists:flatten(Bytes2)),
-
-    ?line {ok,Bytes3} = asn1_wrapper:encode('Prim','ObjId',{2,100,3}),
-    ?line {ok,{2,100,3}} = asn1_wrapper:decode('Prim','ObjId',lists:flatten(Bytes3)),
-
-    ?line {ok,Bytes4} = asn1_wrapper:encode('Prim','ObjId',{2,16303,3}),
-    ?line {ok,{2,16303,3}} = asn1_wrapper:decode('Prim','ObjId',lists:flatten(Bytes4)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,Bytes5} = asn1_wrapper:encode('Prim','ObjId',{2,16304,3}),
-		  ?line {ok,{2,16304,3}} = asn1_wrapper:decode('Prim','ObjId',lists:flatten(Bytes5)),
-		  ok;
-	      per ->
-		  ?line {ok,Bytes5} = asn1_wrapper:encode('Prim','ObjId',{2,16304,3}),
-		  ?line {ok,{2,16304,3}} = asn1_wrapper:decode('Prim','ObjId',lists:flatten(Bytes5)),
-%%		  ?line test_server:format("~p~n",[Kurt]),
-%		  ?line {ok,{2,16304,3}} = asn1_wrapper:decode('Prim','ObjId',lists:flatten(Bytes5)),
-		  ok
-	  end,
-
-
-
+    [roundtrip('ObjId', V) ||
+	V <- [{0,22,3},{1,39,3},{2,100,3},{2,16303,3},{2,16304,3}]],
     ok.
 
 rel_oid(_Rules) ->
-
     %%==========================================================
     %% RelOid ::= RELATIVE-OID
     %%==========================================================
 
-    ?line {ok,Bytes1} = asn1_wrapper:encode('Prim','RelOid',{0,22,3}),
-    ?line {ok,{0,22,3}} = asn1_wrapper:decode('Prim','RelOid',lists:flatten(Bytes1)),
-
-    ?line {ok,Bytes2} = asn1_wrapper:encode('Prim','RelOid',{1,39,3}),
-    ?line {ok,{1,39,3}} = asn1_wrapper:decode('Prim','RelOid',lists:flatten(Bytes2)),
-
-    ?line {ok,Bytes3} = asn1_wrapper:encode('Prim','RelOid',{2,100,3}),
-    ?line {ok,{2,100,3}} = asn1_wrapper:decode('Prim','RelOid',lists:flatten(Bytes3)),
-
-    ?line {ok,Bytes4} = asn1_wrapper:encode('Prim','RelOid',{2,16303,3}),
-    ?line {ok,{2,16303,3}} = asn1_wrapper:decode('Prim','RelOid',lists:flatten(Bytes4)),
-    
-    ?line {ok,Bytes5} = asn1_wrapper:encode('Prim','RelOid',{2,16304,3}),
-    ?line {ok,{2,16304,3}} = asn1_wrapper:decode('Prim','RelOid',lists:flatten(Bytes5)),
-    
-    ?line {ok,Bytes6} = asn1_wrapper:encode('Prim','RelOid',{8,16304,16#ffff}),
-    ?line {ok,{8,16304,16#ffff}} = asn1_wrapper:decode('Prim','RelOid',lists:flatten(Bytes6)),
-    
-
-
+    [roundtrip('RelOid', V) ||
+	V <- [{0,22,3},{1,39,3},{2,100,3},{2,16303,3},
+	      {2,16304,3},{8,16304,16#ffff}]],
     ok.
 
 
-
-
-
 null(_Rules) ->
 
     %%==========================================================
     %% Null ::= NULL
     %%==========================================================
 
-    ?line {ok,Bytes1} = asn1_wrapper:encode('Prim','Null',monday),
-    ?line {ok,'NULL'} = asn1_wrapper:decode('Prim','Null',lists:flatten(Bytes1)),
-
-
-
-ok.
-
+    {ok,Bytes1} = asn1_wrapper:encode('Prim','Null',monday),
+    {ok,'NULL'} = asn1_wrapper:decode('Prim','Null',lists:flatten(Bytes1)),
+    ok.
 
+roundtrip(T, V) ->
+    {ok,E} = 'Prim':encode(T, V),
+    {ok,V} = 'Prim':decode(T, E),
+    E.
 
 real(_Rules) ->
     %%==========================================================
diff --git a/lib/asn1/test/testPrimStrings.erl b/lib/asn1/test/testPrimStrings.erl
index f8b0c5b05a..e2322c92a9 100644
--- a/lib/asn1/test/testPrimStrings.erl
+++ b/lib/asn1/test/testPrimStrings.erl
@@ -54,7 +54,7 @@ bit_string(Rules) ->
     bs_roundtrip('Bs1', [1,0,0,0,0,0,0,0,0]),
     bs_roundtrip('Bs1', [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]),
     
-    case asn1_wrapper:erule(Rules) of
+    case Rules of
 	ber ->
 	    bs_decode('Bs1', <<35,8,3,2,0,73,3,2,4,32>>,
 		      [0,1,0,0,1,0,0,1,0,0,1,0]),
@@ -62,7 +62,7 @@ bit_string(Rules) ->
 		      [1,1,1,0,1,0,1,0,1,0,0,1,1,1,0,0,0]),
 	    bs_decode('Bs1', <<35,128,3,2,0,234,3,3,7,156,0,0,0>>,
 		      [1,1,1,0,1,0,1,0,1,0,0,1,1,1,0,0,0]);
-	per ->
+	_ ->
 	    ok
     end,
 
@@ -71,35 +71,16 @@ bit_string(Rules) ->
     %% Bs2 ::= BIT STRING {su(0), mo(1), tu(2), we(3), th(4), fr(5), sa(6) } (SIZE (7))
     %%==========================================================
     
-    ?line {ok,Bytes21} = asn1_wrapper:encode('PrimStrings','Bs2',[mo,tu,fr]),
-    ?line {ok,[mo,tu,fr]} = asn1_wrapper:decode('PrimStrings','Bs2',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('PrimStrings','Bs2',[0,1,1,0,0,1,0]),
-    ?line {ok,[mo,tu,fr]} = asn1_wrapper:decode('PrimStrings','Bs2',lists:flatten(Bytes22)),
-    ok,
-%% skip this because it is wrong
-%     ?line case asn1_wrapper:erule(Rules) of
-% 	      ber -> 
-% 		  ?line {ok,[mo,tu,fr,su,mo,th]} = 
-% 		      asn1_wrapper:decode('PrimStrings','Bs2',[35,8,3,2,0,101,3,2,2,200]),
-		  
-% 		  ?line {ok,[mo,tu,fr,su,mo,th]} = 
-% 		      asn1_wrapper:decode('PrimStrings','Bs2',[35,128,3,2,1,100,3,2,2,200,0,0]),
-% 		  ok;
-	      
-% 	      per ->
-% 		  ok
-% 	  end,
-    
-    
-    
+    roundtrip('Bs2', [mo,tu,fr]),
+    roundtrip('Bs2', [0,1,1,0,0,1,0], [mo,tu,fr]),
+
     %%==========================================================
     %% Bs3 ::= BIT STRING {su(0), mo(1), tu(2), we(3), th(4), fr(5), sa(6) } (SIZE (1..7))
     %%==========================================================
     
     roundtrip('Bs3', [mo,tu,fr]),
     bs_roundtrip('Bs3', [0,1,1,0,0,1,0], [mo,tu,fr]),
-    
+
     %%==========================================================
     %% Bs7 ::= BIT STRING (SIZE (24))
     %%==========================================================
@@ -114,10 +95,9 @@ bit_string(Rules) ->
     %%==========================================================
     
     bs_roundtrip('BsPri', 45, [1,0,1,1,0,1]),
-    
     bs_roundtrip('BsPri', 211, [1,1,0,0,1,0,1,1]),
     
-    case asn1_wrapper:erule(Rules) of
+    case Rules of
 	ber ->
 	    bs_decode('BsPri', <<223,61,4,5,75,226,96>>,
 		      [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]),
@@ -127,7 +107,7 @@ bit_string(Rules) ->
 		      [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]),
 	    bs_decode('BsPri', <<255,61,128,3,2,0,75,3,3,5,226,96,0,0>>,
 		      [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]);
-	per ->
+	_ ->
 	    ok
     end,
     
@@ -139,11 +119,11 @@ bit_string(Rules) ->
     bs_roundtrip('BsExpPri', 45, [1,0,1,1,0,1]),
     bs_roundtrip('BsExpPri', 211, [1,1,0,0,1,0,1,1]),
     
-    case asn1_wrapper:erule(Rules) of
+    case Rules of
 	ber ->
 	    bs_decode('BsExpPri', <<255,61,6,3,4,5,75,226,96>>,
 		      [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]);
-	per ->
+	_ ->
 	    ok
     end,
     
@@ -151,24 +131,22 @@ bit_string(Rules) ->
     %% TestS ::= BIT STRING {a(0),b(1)} (SIZE (3..8)), test case for OTP-4353
     %%==========================================================
 
-    ?line {ok,Bytes53} = asn1_wrapper:encode('PrimStrings','TestS',[a]),
-    ?line {ok,[a]} = 
-	asn1_wrapper:decode('PrimStrings','TestS',lists:flatten(Bytes53)),
+    roundtrip('TestS', [a]),
 
     %%==========================================================
     %% PersonalStatus ::= BIT STRING {married(0),employed(1),
     %%    veteran(2), collegeGraduate(3)}, test case for OTP-5710
     %%==========================================================
     
-    ?line {ok,Bytes54} = asn1_wrapper:encode('BitStr','PersonalStatus',[]),
-    ?line {ok,[]} = asn1_wrapper:decode('BitStr','PersonalStatus',Bytes54),
+    {ok,Bytes54} = 'BitStr':encode('PersonalStatus', []),
+    {ok,[]} = 'BitStr':decode('PersonalStatus', Bytes54),
     
     %%==========================================================
     %% BS5932 ::= BIT STRING (SIZE (5..MAX))
     %% test case for OTP-5932
     %%==========================================================
     bs_roundtrip('BSMAX', [1,0,1,0,1]),
-    case asn1_wrapper:erule(Rules) of
+    case Rules of
 	ber ->
 	    {error,_} = 'PrimStrings':encode('BSMAX', [1,0,1]);
 	_ ->
@@ -195,7 +173,91 @@ bit_string(Rules) ->
     BSList1024 = BSmaker(BSmaker,0,1024,{1,0},[]),
     bs_roundtrip('BS1024', BSList1024),
 
-    bs_roundtrip('TransportLayerAddress', [0,1,1,0]).
+    bs_roundtrip('TransportLayerAddress', [0,1,1,0]),
+
+    case Rules of
+	ber -> ok;
+	_ -> per_bs_strings()
+    end.
+
+%% The PER encoding rules requires that a BIT STRING with
+%% named positions should never have any trailing zeroes
+%% (except to reach the minimum number of bits as given by
+%% a SIZE constraint).
+
+per_bs_strings() ->
+    bs_roundtrip('Bs3', [0,0,1,0,0,0,0], [tu]),
+    bs_roundtrip('Bs3', <<2#0010000:7>>, [tu]),
+    bs_roundtrip('Bs3', {1,<<2#00100000:8>>}, [tu]),
+
+    bs_roundtrip('Bs4', [0,1,1,0,0,1,0], [mo,tu,fr]),
+    bs_roundtrip('Bs4', <<2#0110010:7>>, [mo,tu,fr]),
+    bs_roundtrip('Bs4', {1,<<2#01100100:8>>}, [mo,tu,fr]),
+
+    bs_roundtrip('Bs4', [0,1,1,0,0,0,0], [mo,tu]),
+    bs_roundtrip('Bs4', <<2#011:3,0:32>>, [mo,tu]),
+    bs_roundtrip('Bs4', {5,<<2#011:3,0:32,0:5>>}, [mo,tu]),
+
+    [per_trailing_zeroes(B) || B <- lists:seq(0, 255)],
+    ok.
+
+%% Trailing zeroes should be removed from BIT STRINGs with named
+%% bit positions.
+
+per_trailing_zeroes(Byte) ->
+    L = lists:reverse(make_bit_list(Byte+16#10000)),
+    L = make_bit_list(Byte+16#10000, []),
+    Pos = positions(L, 0),
+    ExpectedSz = case lists:last(Pos) of
+		     su -> 1;
+		     {bit,LastBitPos} -> LastBitPos+1
+		 end,
+
+    %% List of zeroes and ones.
+    named_roundtrip(L, Pos, ExpectedSz),
+    named_roundtrip(L++[0,0,0,0,0], Pos, ExpectedSz),
+
+    %% Bitstrings.
+    Bs = << <<B:1>> || B <- L >>,
+    Sz = bit_size(Bs),
+    named_roundtrip(Bs, Pos, ExpectedSz),
+    Bin = <<Bs:Sz/bits,0:16,0:7>>,
+    named_roundtrip(Bin, Pos, ExpectedSz),
+
+    %% Compact bitstring.
+    named_roundtrip({7,Bin}, Pos, ExpectedSz),
+
+    %% Integer bitstring (obsolete).
+    IntBs = intlist_to_integer(L, 0, 0),
+    named_roundtrip(IntBs, Pos, ExpectedSz),
+
+    ok.
+
+make_bit_list(0) -> [];
+make_bit_list(B) -> [B band 1|make_bit_list(B bsr 1)].
+
+make_bit_list(0, Acc) -> Acc;
+make_bit_list(B, Acc) -> make_bit_list(B bsr 1, [B band 1|Acc]).
+
+positions([1|T], 0) -> [su|positions(T, 1)];
+positions([1|T], Pos) -> [{bit,Pos}|positions(T, Pos+1)];
+positions([0|T], Pos) -> positions(T, Pos+1);
+positions([], _) -> [].
+
+intlist_to_integer([B|T], Shift, Acc) ->
+    intlist_to_integer(T, Shift+1, (B bsl Shift) + Acc);
+intlist_to_integer([], _, Acc) -> Acc.
+
+named_roundtrip(Value, Expected, ExpectedSz) ->
+    M = 'PrimStrings',
+    Type = 'Bs4',
+    {ok,Encoded} = M:encode(Type, Value),
+    {ok,Encoded} = M:encode(Type, Expected),
+    {ok,Expected} = M:decode(Type, Encoded),
+
+    %% Verify the size in the first byte.
+    <<ExpectedSz:8,_/bits>> = Encoded,
+    ok.
 
 octet_string(Rules) ->
 
@@ -203,21 +265,18 @@ octet_string(Rules) ->
     %% Os ::= OCTET STRING
     %%==========================================================
 
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,"Jones"} = 
-		      asn1_wrapper:decode('PrimStrings','Os',[4,5,16#4A,16#6F,16#6E,16#65,16#73]),
-
-		  ?line {ok,"Jones"} = 
-		      asn1_wrapper:decode('PrimStrings','Os',[36,9,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73]),
-		  
-		  ?line {ok,"Jones"} = 
-		      asn1_wrapper:decode('PrimStrings','Os',[36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0]),
-		  ok;
-	      
-	      per ->
-		  ok
-	  end,
+    case Rules of
+	ber ->
+	    {ok,"Jones"} =
+		'PrimStrings':decode('Os', <<4,5,16#4A,16#6F,16#6E,16#65,16#73>>),
+	    {ok,"Jones"} =
+		'PrimStrings':decode('Os', <<36,9,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73>>),
+	    {ok,"Jones"} =
+		'PrimStrings':decode('Os', <<36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0>>),
+	    ok;
+	_ ->
+	    ok
+    end,
 
     roundtrip('Os', [47,23,99,255,1]),
     roundtrip('OsCon', [47,23,99,255,1]),
@@ -239,27 +298,32 @@ octet_string(Rules) ->
     roundtrip('OsExpApp', OsR),
 
 
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','OsExpApp',[127,62,7,4,5,16#4A,16#6F,16#6E,16#65,16#73]),
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','OsExpApp',[127,62,11,36,9,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73]),
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','OsExpApp',[127,62,13,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0]),
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','OsExpApp',[127,62,128,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,0,0]),
-		  ?line {ok,"JonesJones"} = asn1_wrapper:decode('PrimStrings','OsExpApp',[127,62,128,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,0,0]),
-		  ok;
-	      
-	      per ->
-		  ok
-	  end,
+    case Rules of
+	ber ->
+	    {ok,"Jones"} = 'PrimStrings':decode('OsExpApp', <<127,62,7,4,5,16#4A,16#6F,16#6E,16#65,16#73>>),
+	    {ok,"Jones"} = 'PrimStrings':decode('OsExpApp', <<127,62,11,36,9,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73>>),
+	    {ok,"Jones"} = 'PrimStrings':decode('OsExpApp', <<127,62,13,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0>>),
+	    {ok,"Jones"} = 'PrimStrings':decode('OsExpApp', <<127,62,128,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,0,0>>),
+	    {ok,"JonesJones"} = 'PrimStrings':decode('OsExpApp', <<127,62,128,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,0,0>>),
+	    ok;
+
+	_->
+	    ok
+    end,
 
     fragmented_octet_string(Rules),
 
     S255 = lists:seq(1, 255),
-    FixedStrings = {'OsFixedStrings',true,"","1","12","345",true,
-		    S255,[$a|S255],[$a,$b|S255],397},
-    roundtrip('OsFixedStrings', FixedStrings),
+    Strings = {type,true,"","1","12","345",true,
+	       S255,[$a|S255],[$a,$b|S255],397},
+    p_roundtrip('OsFixedStrings', Strings),
+    p_roundtrip('OsFixedStringsExt', Strings),
+    p_roundtrip('OsVarStringsExt', Strings),
+    ShortenedStrings = shorten_by_two(Strings),
+    p_roundtrip('OsFixedStringsExt', ShortenedStrings),
+    p_roundtrip('OsVarStringsExt', ShortenedStrings),
     ok.
-    
+
 fragmented_octet_string(Erules) ->
     K16 = 1 bsl 14,
     K32 = K16 + K16,
@@ -271,10 +335,12 @@ fragmented_octet_string(Erules) ->
 	    K48-1,K48,K48+1,K48+(1 bsl 7)-1,K48+(1 bsl 7),K48+(1 bsl 7)+1,
 	    K64-1,K64,K64+1,K64+(1 bsl 7)-1,K64+(1 bsl 7),K64+(1 bsl 7)+1,
 	    K64+K16-1,K64+K16,K64+K16+1],
-    Types = ['Os','OsFrag'],
+    Types = ['Os','OsFrag','OsFragExt'],
     [fragmented_octet_string(Erules, Types, L) || L <- Lens],
     fragmented_octet_string(Erules, ['FixedOs65536'], 65536),
     fragmented_octet_string(Erules, ['FixedOs65537'], 65537),
+    fragmented_octet_string(Erules, ['FixedOs65536Ext'], 65536),
+    fragmented_octet_string(Erules, ['FixedOs65537Ext'], 65537),
 
     %% Make sure that octet alignment works.
     roundtrip('OsAlignment',
@@ -336,75 +402,58 @@ numeric_string(Rules) ->
     %%==========================================================
 
     roundtrip('Ns', []),
+    roundtrip('Ns', "01 34"),
+    case Rules of
+	ber ->
+	    {ok,"Jones"} = 'PrimStrings':decode('Ns',
+						<<16#12,5,16#4A,16#6F,
+						 16#6E,16#65,16#73>>),
+	    {ok,"Jones"} = 'PrimStrings':decode('Ns',
+						<<16#32,9,18,3,16#4A,16#6F,
+						 16#6E,18,2,16#65,16#73>>),
+	    {ok,"Jones"} = 'PrimStrings':decode('Ns',
+						<<16#32,128,18,3,16#4A,16#6F,
+						 16#6E,18,2,16#65,16#73,0,0>>),
+	    ok;
+	_ ->
+	    ok
+    end,
 
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,BytesNs1} = asn1_wrapper:encode('PrimStrings','Ns',[48,49,32,51,52]),
-		  ?line {ok,[48,49,32,51,52]} = asn1_wrapper:decode('PrimStrings','Ns',lists:flatten(BytesNs1)),
-
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','Ns',[16#12,5,16#4A,16#6F,16#6E,16#65,16#73]),
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','Ns',[16#32,9,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73]),
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','Ns',[16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0]),
-		  ok;
-	      
-	      per ->
-		  ?line {ok,BytesNs1} = asn1_wrapper:encode('PrimStrings','Ns',[48,49,32,51,52]),
-		  ?line {ok,"01 34"} = asn1_wrapper:decode('PrimStrings','Ns',lists:flatten(BytesNs1)),
-		  ok
-	  end,
-
-    
-
-		       
     %%==========================================================
     %% NsCon ::= [70] NumericString
     %%==========================================================
 
     roundtrip('NsCon', []),
+    roundtrip('NsCon', "01 34"),
 
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,BytesNs11} = asn1_wrapper:encode('PrimStrings','NsCon',[48,49,32,51,52]),
-		  ?line {ok,[48,49,32,51,52]} = asn1_wrapper:decode('PrimStrings','NsCon',lists:flatten(BytesNs11)),
-
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','NsCon',[16#9F,16#46,5,16#4A,16#6F,16#6E,16#65,16#73]),
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','NsCon',[16#BF,16#46,9,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73]),
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','NsCon',[16#BF,16#46,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0]),
-		  ok;
-	      
-	      per ->
-		  ?line {ok,BytesNs11} = asn1_wrapper:encode('PrimStrings','NsCon',[48,49,32,51,52]),
-		  ?line {ok,"01 34"} = asn1_wrapper:decode('PrimStrings','NsCon',lists:flatten(BytesNs11)),
-		  ok
-	  end,
-
+    case Rules of
+	ber ->
+	    {ok,"Jones"} = 'PrimStrings':decode('NsCon', <<16#9F,16#46,5,16#4A,16#6F,16#6E,16#65,16#73>>),
+	    {ok,"Jones"} = 'PrimStrings':decode('NsCon', <<16#BF,16#46,9,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73>>),
+	    {ok,"Jones"} = 'PrimStrings':decode('NsCon', <<16#BF,16#46,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0>>),
+	    ok;
+	_ ->
+	    ok
+    end,
 
-		       
     %%==========================================================
     %% NsExpCon ::= [71] EXPLICIT NumericString
     %%==========================================================
 
     roundtrip('NsExpCon', []),
+    roundtrip('NsExpCon', "01 34"),
 
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,BytesNs21} = asn1_wrapper:encode('PrimStrings','NsExpCon',[48,49,32,51,52]),
-		  ?line {ok,[48,49,32,51,52]} = asn1_wrapper:decode('PrimStrings','NsExpCon',lists:flatten(BytesNs21)),
-
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','NsExpCon',[16#BF,16#47,16#07,16#12,16#05,16#4A,16#6F,16#6E,16#65,16#73]),
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','NsExpCon',[16#BF,16#47,11,16#32,9,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73]),
-		  ?line {ok,"Jones"} = asn1_wrapper:decode('PrimStrings','NsExpCon',[16#BF,16#47,128,16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0,0,0]),
-		  ?line {ok,"JonesJones"} = asn1_wrapper:decode('PrimStrings','NsExpCon',[16#BF,16#47,26,16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0,16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0]),
-		  ?line {ok,"JonesJones"} = asn1_wrapper:decode('PrimStrings','NsExpCon',[16#BF,16#47,128,16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0,16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0,0,0]),
-		  ok;
-	      
-	      per ->
-		  ?line {ok,BytesNs21} = asn1_wrapper:encode('PrimStrings','NsExpCon',[48,49,32,51,52]),
-		  ?line {ok,"01 34"} = asn1_wrapper:decode('PrimStrings','NsExpCon',lists:flatten(BytesNs21)),
-		  ok
-	  end,
-
-    ok.
+    case Rules of
+	ber ->
+	    {ok,"Jones"} = 'PrimStrings':decode('NsExpCon', <<16#BF,16#47,16#07,16#12,16#05,16#4A,16#6F,16#6E,16#65,16#73>>),
+	    {ok,"Jones"} = 'PrimStrings':decode('NsExpCon', <<16#BF,16#47,11,16#32,9,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73>>),
+	    {ok,"Jones"} = 'PrimStrings':decode('NsExpCon', <<16#BF,16#47,128,16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0,0,0>>),
+	    {ok,"JonesJones"} = 'PrimStrings':decode('NsExpCon', <<16#BF,16#47,26,16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0,16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0>>),
+	    {ok,"JonesJones"} = 'PrimStrings':decode('NsExpCon', <<16#BF,16#47,128,16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0,16#32,128,18,3,16#4A,16#6F,16#6E,18,2,16#65,16#73,0,0,0,0>>),
+	    ok;
+	_ ->
+	    ok
+    end.
 
 		       
 other_strings(_Rules) ->
@@ -438,6 +487,15 @@ other_strings(_Rules) ->
 
     roundtrip('IA5Visible', lists:seq($\s, $~)),
 
+    S255 = lists:seq(0, 127) ++ lists:seq(1, 127),
+    Strings = {type,true,"","1","12","345",true,"6789",true,
+	       S255,[$a|S255],[$a,$b|S255],397},
+    p_roundtrip('IA5FixedStrings', Strings),
+    p_roundtrip('IA5FixedStringsExt', Strings),
+    p_roundtrip('IA5VarStringsExt', Strings),
+    ShortenedStrings = shorten_by_two(Strings),
+    p_roundtrip('IA5VarStringsExt', ShortenedStrings),
+
     ok.
 
 
@@ -491,23 +549,19 @@ universal_string(Rules) ->
     %%==========================================================
     
     roundtrip('Us', [{47,23,99,47},{0,0,55,66}]),
-    
-    ?line {ok,Bytes2} = 
-	asn1_wrapper:encode('PrimStrings','Us',[{47,23,99,255},{0,0,0,201}]),
-    ?line {ok,[{47,23,99,255},201]} = 
-	asn1_wrapper:decode('PrimStrings','Us',lists:flatten(Bytes2)),
-    
+    roundtrip('Us',
+	      [{47,23,99,255},{0,0,0,201}],
+	      [{47,23,99,255},201]),
     roundtrip('Us', "Universal String"),
     roundtrip('Us', []),
     roundtrip('Us', [{47,23,99,47}]),
     
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-    
-		  ?line {ok,[{47,23,99,255},{0,0,2,201}]} = 
-		      asn1_wrapper:decode('PrimStrings','Us',lists:flatten([16#3C,12,28,4,47,23,99,255,28,4,0,0,2,201])),
-		  ?line {ok,[{47,23,99,255},{0,0,2,201}]} = 
-		      asn1_wrapper:decode('PrimStrings','Us',lists:flatten([16#3C,16#80,28,4,47,23,99,255,28,4,0,0,2,201,0,0]));
+    case Rules of
+	ber ->
+	    {ok,[{47,23,99,255},{0,0,2,201}]} =
+		'PrimStrings':decode('Us', <<16#3C,12,28,4,47,23,99,255,28,4,0,0,2,201>>),
+	    {ok,[{47,23,99,255},{0,0,2,201}]} =
+		'PrimStrings':decode('Us', <<16#3C,16#80,28,4,47,23,99,255,28,4,0,0,2,201,0,0>>);
 	      _ ->
 		  ok
 	  end,
@@ -522,24 +576,21 @@ universal_string(Rules) ->
 %%==========================================================
 
     roundtrip('UsCon', [{47,23,99,255},{0,0,2,201}]),
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('PrimStrings','UsCon',[{47,23,99,255},{0,0,0,201}]),
-    ?line {ok,[{47,23,99,255},201]} = 
-	asn1_wrapper:decode('PrimStrings','UsCon',lists:flatten(Bytes12)),
-    
+    roundtrip('UsCon',
+	      [{47,23,99,255},{0,0,0,201}],
+	      [{47,23,99,255},201]),
     roundtrip('UsCon', "Universal String"),
     roundtrip('UsCon', []),
     
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber -> 
-		  ?line {ok,[{47,23,99,255},{0,0,2,201}]} = 
-		      asn1_wrapper:decode('PrimStrings','UsCon',lists:flatten([16#BF,16#46,12,28,4,47,23,99,255,28,4,0,0,2,201])),
-		  ?line {ok,[{47,23,99,255},{0,0,2,201}]} = 
-		      asn1_wrapper:decode('PrimStrings','UsCon',lists:flatten([16#BF,16#46,16#80,28,4,47,23,99,255,28,4,0,0,2,201,0,0]));
-	      _ -> ok
-	  end,
-
+    case Rules of
+	ber ->
+	    {ok,[{47,23,99,255},{0,0,2,201}]} =
+		'PrimStrings':decode('UsCon', <<16#BF,16#46,12,28,4,47,23,99,255,28,4,0,0,2,201>>),
+	    {ok,[{47,23,99,255},{0,0,2,201}]} =
+		'PrimStrings':decode('UsCon', <<16#BF,16#46,16#80,28,4,47,23,99,255,28,4,0,0,2,201,0,0>>);
+	_ ->
+	    ok
+    end,
 
 
 %%==========================================================
@@ -547,25 +598,21 @@ universal_string(Rules) ->
 %%==========================================================
 
     roundtrip('UsExpCon', [{47,23,99,255},{0,0,2,201}]),
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('PrimStrings','UsExpCon',[{47,23,99,255},{0,0,0,201}]),
-    ?line {ok,[{47,23,99,255},201]} = 
-	asn1_wrapper:decode('PrimStrings','UsExpCon',lists:flatten(Bytes22)),
-    
+    roundtrip('UsExpCon',
+	      [{47,23,99,255},{0,0,0,201}],
+	      [{47,23,99,255},201]),
     roundtrip('UsExpCon', "Universal String"),
     roundtrip('UsExpCon', []),
     
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber ->     
-		  ?line {ok,[{47,23,99,255},{0,0,2,201}]} = 
-		      asn1_wrapper:decode('PrimStrings','UsExpCon',lists:flatten([16#BF,16#47,14,60,12,28,4,47,23,99,255,28,4,0,0,2,201])),
-		  ?line {ok,[{47,23,99,255},{0,0,2,201}]} = 
-		      asn1_wrapper:decode('PrimStrings','UsExpCon',lists:flatten([16#BF,16#47,16,60,16#80,28,4,47,23,99,255,28,4,0,0,2,201,0,0]));
-	      _ -> ok
-	  end,
-
-    ok.
+    case Rules of
+	ber ->
+	    {ok,[{47,23,99,255},{0,0,2,201}]} =
+		'PrimStrings':decode('UsExpCon', <<16#BF,16#47,14,60,12,28,4,47,23,99,255,28,4,0,0,2,201>>),
+	    {ok,[{47,23,99,255},{0,0,2,201}]} =
+		'PrimStrings':decode('UsExpCon', <<16#BF,16#47,16,60,16#80,28,4,47,23,99,255,28,4,0,0,2,201,0,0>>);
+	_ ->
+	    ok
+    end.
 
 		       
 bmp_string(_Rules) ->
@@ -575,12 +622,9 @@ bmp_string(_Rules) ->
     %%==========================================================
 
     roundtrip('BMP', [{0,0,99,48},{0,0,2,201}]),
-    
-    ?line {ok,Bytes2} = 
-	asn1_wrapper:encode('PrimStrings','BMP',[{0,0,0,48},{0,0,2,201}]),
-    ?line {ok,[48,{0,0,2,201}]} = 
-	asn1_wrapper:decode('PrimStrings','BMP',lists:flatten(Bytes2)),
-
+    roundtrip('BMP',
+	      [{0,0,0,48},{0,0,2,201}],
+	      [48,{0,0,2,201}]),
     roundtrip('BMP', "BMP String"),
     roundtrip('BMP', []),
 
@@ -589,9 +633,6 @@ bmp_string(_Rules) ->
 		     
     ok.
 
-
-
-
 		       
 times(_Rules) ->
 
@@ -620,106 +661,58 @@ utf8_string(_Rules) ->
     %% UTF ::= UTF8String
     %%==========================================================
 
-    %% test values in all ranges
-
-    ValLbR1 = [16#00],
-    ValUbR1 = [16#7f],
-    ValLbR2 = [16#80],
-    ValUbR2 = [16#7ff],
-    ValLbR3 = [16#800],
-    ValUbR3 = [16#ffff],
-    ValLbR4 = [16#10000],
-    ValUbR4 = [16#1fffff],
-    ValLbR5 = [16#200000],
-    ValUbR5 = [16#3ffffff],
-    ValLbR6 = [16#4000000],
-    ValUbR6 = [16#7fffffff],
-    
-    ?line {ok,UTF8L1} = asn1rt:utf8_list_to_binary(ValLbR1),
-    ?line {ok,Bytes1} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L1),
-    ?line {ok,Bin1} = asn1_wrapper:decode('PrimStrings','UTF',Bytes1),
-    ?line {ok,ValLbR1} = wrapper_utf8_binary_to_list(Bin1),
-    
-    ?line {ok,UTF8L2} = asn1rt:utf8_list_to_binary(ValUbR1),
-    ?line {ok,Bytes2} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L2),
-    ?line {ok,Bin2} = asn1_wrapper:decode('PrimStrings','UTF',Bytes2),
-    ?line {ok,ValUbR1} = wrapper_utf8_binary_to_list(Bin2),
-
-    ?line {ok,UTF8L3} = asn1rt:utf8_list_to_binary(ValLbR2),
-    ?line {ok,Bytes3} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L3),
-    ?line {ok,Bin3} = asn1_wrapper:decode('PrimStrings','UTF',Bytes3),
-    ?line {ok,ValLbR2} = wrapper_utf8_binary_to_list(Bin3),
-
-    ?line {ok,UTF8L4} = asn1rt:utf8_list_to_binary(ValUbR2),
-    ?line {ok,Bytes4} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L4),
-    ?line {ok,Bin4} = asn1_wrapper:decode('PrimStrings','UTF',Bytes4),
-    ?line {ok,ValUbR2} = wrapper_utf8_binary_to_list(Bin4),
-
-    ?line {ok,UTF8L5} = asn1rt:utf8_list_to_binary(ValLbR3),
-    ?line {ok,Bytes5} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L5),
-    ?line {ok,Bin5} = asn1_wrapper:decode('PrimStrings','UTF',Bytes5),
-    ?line {ok,ValLbR3} = wrapper_utf8_binary_to_list(Bin5),
-
-    ?line {ok,UTF8L6} = asn1rt:utf8_list_to_binary(ValUbR3),
-    ?line {ok,Bytes6} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L6),
-    ?line {ok,Bin6} = asn1_wrapper:decode('PrimStrings','UTF',Bytes6),
-    ?line {ok,ValUbR3} = wrapper_utf8_binary_to_list(Bin6),
-
-    ?line {ok,UTF8L7} = asn1rt:utf8_list_to_binary(ValLbR4),
-    ?line {ok,Bytes7} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L7),
-    ?line {ok,Bin7} = asn1_wrapper:decode('PrimStrings','UTF',Bytes7),
-    ?line {ok,ValLbR4} = wrapper_utf8_binary_to_list(Bin7),
-
-    ?line {ok,UTF8L8} = asn1rt:utf8_list_to_binary(ValUbR4),
-    ?line {ok,Bytes8} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L8),
-    ?line {ok,Bin8} = asn1_wrapper:decode('PrimStrings','UTF',Bytes8),
-    ?line {ok,ValUbR4} = wrapper_utf8_binary_to_list(Bin8),
-
-    ?line {ok,UTF8L9} = asn1rt:utf8_list_to_binary(ValLbR5),
-    ?line {ok,Bytes9} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L9),
-    ?line {ok,Bin9} = asn1_wrapper:decode('PrimStrings','UTF',Bytes9),
-    ?line {ok,ValLbR5} = wrapper_utf8_binary_to_list(Bin9),
-
-    ?line {ok,UTF8L10} = asn1rt:utf8_list_to_binary(ValUbR5),
-    ?line {ok,Bytes10} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L10),
-    ?line {ok,Bin10} = asn1_wrapper:decode('PrimStrings','UTF',Bytes10),
-    ?line {ok,ValUbR5} = wrapper_utf8_binary_to_list(Bin10),
-
-    ?line {ok,UTF8L11} = asn1rt:utf8_list_to_binary(ValLbR6),
-    ?line {ok,Bytes11} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L11),
-    ?line {ok,Bin11} = asn1_wrapper:decode('PrimStrings','UTF',Bytes11),
-    ?line {ok,ValLbR6} = wrapper_utf8_binary_to_list(Bin11),
-
-    ?line {ok,UTF8L12} = asn1rt:utf8_list_to_binary(ValUbR6),
-    ?line {ok,Bytes12} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L12),
-    ?line {ok,Bin12} = asn1_wrapper:decode('PrimStrings','UTF',Bytes12),
-    ?line {ok,ValUbR6} = wrapper_utf8_binary_to_list(Bin12),
-    
-    LVal = ValLbR1++ValUbR1++ValLbR2++ValUbR2++ValLbR3++ValUbR3++
-	ValLbR4++ValUbR4++ValLbR5++ValUbR5++ValLbR6++ValUbR6,
-    LongVal = LVal++LVal++LVal++LVal++LVal++LVal++LVal++"hello",
-    
-    ?line {ok,UTF8L13} = asn1rt:utf8_list_to_binary(LongVal),
-    ?line {ok,Bytes13} = asn1_wrapper:encode('PrimStrings','UTF',UTF8L13),
-    ?line {ok,Bin13} = asn1_wrapper:decode('PrimStrings','UTF',Bytes13),
-    ?line {ok,LongVal} = wrapper_utf8_binary_to_list(Bin13).
+    AllRanges = [16#00,
+		 16#7f,
+		 16#80,
+		 16#7ff,
+		 16#800,
+		 16#ffff,
+		 16#10000,
+		 16#1fffff,
+		 16#200000,
+		 16#3ffffff,
+		 16#4000000,
+		 16#7fffffff],
+    [begin
+	 {ok,UTF8} = asn1rt:utf8_list_to_binary([Char]),
+	 {ok,[Char]} = asn1rt:utf8_binary_to_list(UTF8),
+	 roundtrip('UTF', UTF8)
+     end || Char <- AllRanges],
+
+    {ok,UTF8} = asn1rt:utf8_list_to_binary(AllRanges),
+    {ok,AllRanges} = asn1rt:utf8_binary_to_list(UTF8),
+    roundtrip('UTF', UTF8),
+    ok.
+
+
+shorten_by_two(Tuple) ->
+    L = [case E of
+	     [_,_|T] -> T;
+	     _ -> E
+	 end || E <- tuple_to_list(Tuple)],
+    list_to_tuple(L).
 
-wrapper_utf8_binary_to_list(L) when is_list(L) ->
-    asn1rt:utf8_binary_to_list(list_to_binary(L));
-wrapper_utf8_binary_to_list(B) ->
-    asn1rt:utf8_binary_to_list(B).
+p_roundtrip(Type, Value0) ->
+    Value = setelement(1, Value0, Type),
+    roundtrip(Type, Value).
 
 roundtrip(Type, Value) ->
     {ok,Encoded} = 'PrimStrings':encode(Type, Value),
     {ok,Value} = 'PrimStrings':decode(Type, Encoded),
     ok.
 
+roundtrip(Type, Value, Expected) ->
+    {ok,Encoded} = 'PrimStrings':encode(Type, Value),
+    {ok,Expected} = 'PrimStrings':decode(Type, Encoded),
+    ok.
+
 bs_roundtrip(Type, Value) ->
     bs_roundtrip(Type, Value, Value).
 
 bs_roundtrip(Type, Value, Expected) ->
     M = 'PrimStrings',
     {ok,Encoded} = M:encode(Type, Value),
+    {ok,Encoded} = M:encode(Type, Expected),
     case M:decode(Type, Encoded) of
 	{ok,Expected} ->
 	    ok;
diff --git a/lib/asn1/test/testSeqOf.erl b/lib/asn1/test/testSeqOf.erl
index 1aa1eab26d..c1af0d7a32 100644
--- a/lib/asn1/test/testSeqOf.erl
+++ b/lib/asn1/test/testSeqOf.erl
@@ -28,193 +28,110 @@
 -record('Seq3',{bool3, seq3 = asn1_DEFAULT, int3}).
 -record('Seq4',{seq41 = asn1_DEFAULT, seq42 = asn1_DEFAULT, seq43 = asn1_DEFAULT}).
 -record('SeqIn',{boolIn, intIn}).
-%-record('SeqCho',{bool1, int1, seq1 = asn1_DEFAULT}).
-%-record('SeqChoInline',{bool1, int1, seq1 = asn1_DEFAULT}).
-%-record('SeqChoOfInline_SEQOF',{bool1, int1, seq1 = asn1_DEFAULT}).
 -record('SeqEmp',{seq1}).
 -record('Empty',{}).
 
-main(Rules) ->
-
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqOf','Seq1',#'Seq1'{bool1 = true,
-					     int1 = 17}),
-    ?line {ok,{'Seq1',true,17,[]}} = 
-	asn1_wrapper:decode('SeqOf','Seq1',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SeqOf','Seq1',#'Seq1'{bool1 = true,
-					     int1 = 17,
-					     seq1 = [#'SeqIn'{boolIn = true,
-							      intIn = 25}]}),
-    ?line {ok,{'Seq1',true,17,[{'SeqIn',true,25}]}} = 
-	asn1_wrapper:decode('SeqOf','Seq1',lists:flatten(Bytes12)),
-    
-    
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SeqOf','Seq1',#'Seq1'{bool1 = true,
-					     int1 = 17,
-					     seq1 = [#'SeqIn'{boolIn = true,
-							      intIn = 25},
-						     #'SeqIn'{boolIn = false,
-							      intIn = 125},
-						     #'SeqIn'{boolIn = false,
-							      intIn = 225}]}),
-    ?line {ok,{'Seq1',true,17,[{'SeqIn',true,25},{'SeqIn',false,125},{'SeqIn',false,225}]}} = 
-	asn1_wrapper:decode('SeqOf','Seq1',lists:flatten(Bytes13)),
-
-
-
-
-
-
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqOf','Seq2',#'Seq2'{bool2 = true,
-					     int2 = 17}),
-    
-    ?line {ok,{'Seq2',[],true,17}} = 
-	asn1_wrapper:decode('SeqOf','Seq2',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SeqOf','Seq2',#'Seq2'{bool2 = true,
-					     int2 = 17,
-					     seq2 = [#'SeqIn'{boolIn = true,
-							      intIn = 25}]}),
-    ?line {ok,{'Seq2',[{'SeqIn',true,25}],true,17}} = 
-	asn1_wrapper:decode('SeqOf','Seq2',lists:flatten(Bytes22)),
-    
-    
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SeqOf','Seq2',#'Seq2'{bool2 = true,
-					     int2 = 17,
-					     seq2 = [#'SeqIn'{boolIn = true,
-							      intIn = 25},
-						     #'SeqIn'{boolIn = false,
-							      intIn = 125},
-						     #'SeqIn'{boolIn = false,
-							      intIn = 225}]}),
-    ?line {ok,{'Seq2',[{'SeqIn',true,25},{'SeqIn',false,125},{'SeqIn',false,225}],true,17}} = 
-	asn1_wrapper:decode('SeqOf','Seq2',lists:flatten(Bytes23)),
-    
-    
-
-
-
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SeqOf','Seq3',#'Seq3'{bool3 = true,
-					     int3 = 17}),
-    ?line {ok,{'Seq3',true,[],17}} = 
-	asn1_wrapper:decode('SeqOf','Seq3',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SeqOf','Seq3',#'Seq3'{bool3 = true,
-					     int3 = 17,
-					     seq3 = [#'SeqIn'{boolIn = true,
-							      intIn = 25}]}),
-    ?line {ok,{'Seq3',true,[{'SeqIn',true,25}],17}} = 
-	asn1_wrapper:decode('SeqOf','Seq3',lists:flatten(Bytes32)),
-    
-    
-    ?line {ok,Bytes33} = 
-	asn1_wrapper:encode('SeqOf','Seq3',#'Seq3'{bool3 = true,
-					     int3 = 17,
-					     seq3 = [#'SeqIn'{boolIn = true,
-							      intIn = 25},
-						     #'SeqIn'{boolIn = false,
-							      intIn = 125},
-						     #'SeqIn'{boolIn = false,
-							      intIn = 225}]}),
-    ?line {ok,{'Seq3',true,[{'SeqIn',true,25},{'SeqIn',false,125},{'SeqIn',false,225}],17}} = 
-	asn1_wrapper:decode('SeqOf','Seq3',lists:flatten(Bytes33)),
-    
-  
+main(_Rules) ->
+    SeqIn3 = [#'SeqIn'{boolIn=true,intIn=25},
+	      #'SeqIn'{boolIn=false,intIn=125},
+	      #'SeqIn'{boolIn=false,intIn=225}],
+
+    roundtrip('Seq1', #'Seq1'{bool1=true,int1=17},
+	      #'Seq1'{bool1=true,int1=17,seq1=[]}),
+
+    roundtrip('Seq1', #'Seq1'{bool1=true,int1 = 17,
+			      seq1=[#'SeqIn'{boolIn=true,
+					     intIn=25}]}),
+    roundtrip('Seq1', #'Seq1'{bool1=true,
+			      int1=17,
+			      seq1=SeqIn3}),
+
+    roundtrip('Seq2', #'Seq2'{bool2=true,int2=17},
+	      #'Seq2'{seq2=[],bool2=true,int2=17}),
+    roundtrip('Seq2',#'Seq2'{bool2=true,int2=17,
+			     seq2=[#'SeqIn'{boolIn=true,
+					    intIn=25}]}),
+    roundtrip('Seq2', #'Seq2'{bool2=true,
+			      int2=17,
+			      seq2=SeqIn3}),
+
+    roundtrip('Seq3', #'Seq3'{bool3=true,int3=17},
+	      #'Seq3'{bool3=true,seq3=[],int3=17}),
+    roundtrip('Seq3',#'Seq3'{bool3=true,
+			     int3=17,
+			     seq3=[#'SeqIn'{boolIn=true,
+					    intIn=25}]}),
+    roundtrip('Seq3', #'Seq3'{bool3=true,int3=17,seq3=SeqIn3}),
+
+    roundtrip('Seq4', #'Seq4'{}, #'Seq4'{seq41=[],seq42=[],seq43=[]}),
+
+    roundtrip('Seq4', #'Seq4'{seq41=[#'SeqIn'{boolIn=true,intIn=25}]},
+	      #'Seq4'{seq41=[#'SeqIn'{boolIn=true,intIn=25}],
+		      seq42=[],seq43=[]}),
+
+    roundtrip('Seq4', #'Seq4'{seq41=SeqIn3},
+	      #'Seq4'{seq41=SeqIn3,seq42=[],seq43=[]}),
+    roundtrip('Seq4', #'Seq4'{seq42=[#'SeqIn'{boolIn=true,intIn=25}]},
+	      #'Seq4'{seq41=[],seq42=[#'SeqIn'{boolIn=true,intIn=25}],
+		      seq43=[]}),
+    roundtrip('Seq4', #'Seq4'{seq42=SeqIn3},
+	      #'Seq4'{seq41=[],seq42=SeqIn3,seq43=[]}),
+    
+    roundtrip('Seq4', #'Seq4'{seq43=[#'SeqIn'{boolIn=true,intIn=25}]},
+	      #'Seq4'{seq41=[],seq42=[],
+		      seq43=[#'SeqIn'{boolIn=true,intIn=25}]}),
+    roundtrip('Seq4', #'Seq4'{seq43=SeqIn3},
+	      #'Seq4'{seq41=[],seq42=[],
+		      seq43=SeqIn3}),
+    
+    roundtrip('SeqEmp', #'SeqEmp'{seq1=[#'Empty'{}]}),
+
+    %% Test constrained, extensible size.
+
+    SeqIn = #'SeqIn'{boolIn=true,intIn=978654321},
+    roundtrip('SeqExt', {'SeqExt',true,[],true,[],789}),
+    roundtrip('SeqExt', {'SeqExt',true,lists:duplicate(1, SeqIn),
+			 true,lists:duplicate(0, SeqIn),777}),
+    roundtrip('SeqExt', {'SeqExt',true,lists:duplicate(1, SeqIn),
+			 true,lists:duplicate(1, SeqIn),777}),
+    roundtrip('SeqExt', {'SeqExt',true,lists:duplicate(1, SeqIn),
+			 true,lists:duplicate(127, SeqIn),777}),
+    roundtrip('SeqExt', {'SeqExt',true,lists:duplicate(2, SeqIn),
+			 true,lists:duplicate(128, SeqIn),1777}),
+    roundtrip('SeqExt', {'SeqExt',true,lists:duplicate(2, SeqIn),
+			 true,lists:duplicate(255, SeqIn),7773}),
+    roundtrip('SeqExt', {'SeqExt',true,lists:duplicate(2, SeqIn),
+			 true,lists:duplicate(256, SeqIn),77755}),
+    roundtrip('SeqExt', {'SeqExt',true,lists:duplicate(2, SeqIn),
+			 true,lists:duplicate(257, SeqIn),8888}),
+    roundtrip('SeqExt', {'SeqExt',true,lists:duplicate(3, SeqIn),
+			 true,lists:duplicate(1024, SeqIn),999988888}),
+    roundtrip('SeqExt', {'SeqExt',true,lists:duplicate(15, SeqIn),
+			 true,lists:duplicate(2000, SeqIn),555555}),
+
+    %% Test OTP-4590: correct encoding of the length of SEQUENC OF.
+    DayNames = ["Monday","Tuesday","Wednesday",
+		"Thursday","Friday","Saturday","Sunday"],
+    xroundtrip('DayNames1', 'DayNames3', DayNames),
+    xroundtrip('DayNames2', 'DayNames4', DayNames),
+    xroundtrip('DayNames2', 'DayNames4', [hd(DayNames)]),
+    xroundtrip('DayNames2', 'DayNames4', tl(DayNames)),
 
+    ok.
 
+roundtrip(T, V) ->
+    roundtrip(T, V, V).
 
-  
-    
-    ?line {ok,Bytes41} = asn1_wrapper:encode('SeqOf','Seq4',#'Seq4'{}),
-    ?line {ok,{'Seq4',[],[],[]}} = asn1_wrapper:decode('SeqOf','Seq4',lists:flatten(Bytes41)),
-        
-    
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SeqOf','Seq4',#'Seq4'{seq41 = [#'SeqIn'{boolIn = true,
-							       intIn = 25}]}),
-    ?line {ok,{'Seq4',[{'SeqIn',true,25}],[],[]}} = 
-	asn1_wrapper:decode('SeqOf','Seq4',lists:flatten(Bytes42)),
-    
-    
-    ?line {ok,Bytes43} = 
-	asn1_wrapper:encode('SeqOf','Seq4',#'Seq4'{seq41 = [#'SeqIn'{boolIn = true,
-							       intIn = 25},
-						      #'SeqIn'{boolIn = false,
-							       intIn = 125},
-						      #'SeqIn'{boolIn = false,
-							       intIn = 225}]}),
-    ?line {ok,{'Seq4',[{'SeqIn',true,25},{'SeqIn',false,125},{'SeqIn',false,225}],[],[]}} = 
-	asn1_wrapper:decode('SeqOf','Seq4',lists:flatten(Bytes43)),
-    
-    
-    ?line {ok,Bytes44} = 
-	asn1_wrapper:encode('SeqOf','Seq4',#'Seq4'{seq42 = [#'SeqIn'{boolIn = true,
-								       intIn = 25}]}),
-    ?line {ok,{'Seq4',[],[{'SeqIn',true,25}],[]}} = 
-	asn1_wrapper:decode('SeqOf','Seq4',lists:flatten(Bytes44)),
-    
-    
-    ?line {ok,Bytes45} = 
-	asn1_wrapper:encode('SeqOf','Seq4',#'Seq4'{seq42 = [#'SeqIn'{boolIn = true,
-							       intIn = 25},
-						      #'SeqIn'{boolIn = false,
-							       intIn = 125},
-						      #'SeqIn'{boolIn = false,
-							       intIn = 225}]}),
-    ?line {ok,{'Seq4',[],[{'SeqIn',true,25},{'SeqIn',false,125},{'SeqIn',false,225}],[]}} = 
-	asn1_wrapper:decode('SeqOf','Seq4',lists:flatten(Bytes45)),
-    
-    
-    ?line {ok,Bytes46} = 
-	asn1_wrapper:encode('SeqOf','Seq4',#'Seq4'{seq43 = [#'SeqIn'{boolIn = true,
-							       intIn = 25}]}),
-    ?line {ok,{'Seq4',[],[],[{'SeqIn',true,25}]}} = 
-	asn1_wrapper:decode('SeqOf','Seq4',lists:flatten(Bytes46)),
-    
-    
-    ?line {ok,Bytes47} = 
-	asn1_wrapper:encode('SeqOf','Seq4',#'Seq4'{seq43 = [#'SeqIn'{boolIn = true,
-							       intIn = 25},
-						      #'SeqIn'{boolIn = false,
-							       intIn = 125},
-						      #'SeqIn'{boolIn = false,
-							       intIn = 225}]}),
-    ?line {ok,{'Seq4',[],[],[{'SeqIn',true,25},{'SeqIn',false,125},{'SeqIn',false,225}]}} = 
-	asn1_wrapper:decode('SeqOf','Seq4',lists:flatten(Bytes47)),
-    
-    
-    ?line {ok,Bytes51} = asn1_wrapper:encode('SeqOf','SeqEmp',#'SeqEmp'{seq1 = [#'Empty'{}]}),
-    ?line {ok,{'SeqEmp',[{'Empty'}]}} = asn1_wrapper:decode('SeqOf','SeqEmp',lists:flatten(Bytes51)),
-
-    %% tests of OTP-4590
-    case Rules of
-	per ->
-	    DayNames = ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
-	    ?line {ok,Bytes60} = asn1_wrapper:encode('XSeqOf','DayNames2',DayNames),
-	    ?line {ok,Bytes60} = asn1_wrapper:encode('XSeqOf','DayNames4',DayNames),
-	    ?line {ok,DayNames} = asn1_wrapper:decode('XSeqOf','DayNames2',Bytes60),
-	    ?line {ok,DayNames} = asn1_wrapper:decode('XSeqOf','DayNames4',Bytes60),
-	    ?line {ok,Bytes61} = asn1_wrapper:encode('XSeqOf','DayNames1',DayNames),
-	    ?line {ok,Bytes61} = asn1_wrapper:encode('XSeqOf','DayNames3',DayNames),
-	    ?line {ok,DayNames} = asn1_wrapper:decode('XSeqOf','DayNames1',Bytes61),
-	    ?line {ok,DayNames} = asn1_wrapper:decode('XSeqOf','DayNames3',Bytes61);
-	_ ->
-	    ok
-    end,
-
+roundtrip(Type, Val, Expected) ->
+    M = 'SeqOf',
+    {ok,Enc} = M:encode(Type, Val),
+    {ok,Expected} = M:decode(Type, Enc),
     ok.
 
-
+xroundtrip(T1, T2, Val) ->
+    M = 'XSeqOf',
+    {ok,Enc} = M:encode(T1, Val),
+    {ok,Enc} = M:encode(T2, Val),
+    {ok,Val} = M:decode(T1, Enc),
+    {ok,Val} = M:decode(T2, Enc),
+    ok.