diff --git a/oletools/oleform.py b/oletools/oleform.py
index 245a102..99f9059 100644
--- a/oletools/oleform.py
+++ b/oletools/oleform.py
@@ -24,6 +24,11 @@ class Mask(object):
     def __getitem__(self, key):
         return self._val[self._names.index(key)]
 
+    def consume(self, stream, props):
+        for (name, size) in props:
+            if self[name]:
+                stream.read(size)
+
 class FormPropMask(Mask):
     """FormPropMask: [MS-OFORMS] 2.2.10.2"""
     _size = 28
@@ -52,12 +57,60 @@ class MorphDataPropMask(Mask):
               'fBorderColor', 'fSpecialEffect', 'fMouseIcon', 'fPicture', 'fAccelerator',
               'UnusedBits2', 'Reserved', 'fGroupName']
 
+class ImagePropMask(Mask):
+    """ImagePropMask: [MS-OFORMS] 2.2.3.2"""
+    _size = 15
+    _names = ['UnusedBits1_1', 'UnusedBits1_2', 'fAutoSize', 'fBorderColor', 'fBackColor',
+              'fBorderStyle', 'fMousePointer', 'fPictureSizeMode', 'fSpecialEffect', 'fSize',
+              'fPicture', 'fPictureAlignment', 'fPictureTiling', 'fVariousPropertyBits',
+              'fMouseIcon']
+
+class CommandButtonPropMask(Mask):
+    """CommandButtonPropMask: [MS-OFORMS] 2.2.1.2"""
+    _size = 11
+    _names = ['fForeColor', 'fBackColor', 'fVariousPropertyBits', 'fCaption', 'fPicturePosition',
+              'fSize', 'fMousePointer', 'fPicture', 'fAccelerator', 'fTakeFocusOnClick',
+              'fMouseIcon']
+
+class SpinButtonPropMask(Mask):
+    """SpinButtonPropMask: [MS-OFORMS] 2.2.8.2"""
+    _size = 15
+    _names = ['fForeColor', 'fBackColor', 'fVariousPropertyBits', 'fSize', 'UnusedBits1',
+              'fMin', 'fMax', 'fPosition', 'fPrevEnabled', 'fNextEnabled', 'fSmallChange',
+              'fOrientation', 'fDelay', 'fMouseIcon', 'fMousePointer']
+
+class TabStripPropMask(Mask):
+    """TabStripPropMask: [MS-OFORMS] 2.2.9.2"""
+    _size = 25
+    _names = ['fListIndex', 'fBackColor', 'fForeColor', 'Unused1', 'fSize', 'fItems',
+              'fMousePointer', 'Unused2', 'fTabOrientation', 'fTabStyle', 'fMultiRow',
+              'fTabFixedWidth', 'fTabFixedHeight', 'fTooltips', 'Unused3', 'fTipStrings',
+              'Unused4', 'fNames', 'fVariousPropertyBits', 'fNewVersion', 'fTabsAllocated',
+              'fTags', 'fTabData', 'fAccelerator', 'fMouseIcon']
+
+class LabelPropMask(Mask):
+    """LabelPropMask: [MS-OFORMS] 2.2.4.2"""
+    _size = 13
+    _names = ['fForeColor', 'fBackColor', 'fVariousPropertyBits', 'fCaption',
+              'fPicturePosition', 'fSize', 'fMousePointer', 'fBorderColor', 'fBorderStyle',
+              'fSpecialEffect', 'fPicture', 'fAccelerator', 'fMouseIcon']
+
+class ScrollBarPropMask(Mask):
+    """ScrollBarPropMask: [MS-OFORMS] 2.2.7.2"""
+    _size = 17
+    _names = ['fForeColor', 'fBackColor', 'fVariousPropertyBits', 'fSize', 'fMousePointer',
+              'fMin', 'fMax', 'fPosition', 'UnusedBits1', 'fPrevEnabled', 'fNextEnabled',
+              'fSmallChange', 'fLargeChange', 'fOrientation', 'fProportionalThumb',
+              'fDelay', 'fMouseIcon']
+
 class ExtendedStream(object):
     def __init__(self, stream, path):
         self._pos = 0
         self._jumps = []
         self._stream = stream
         self._path = path
+        self._padding = False
+        self._pad_start = 0
 
     @classmethod
     def open(cls, ole_file, path):
@@ -68,31 +121,55 @@ class ExtendedStream(object):
         # print('declared size: %d' % ole_file.get_size(path))
         return cls(stream, path)
 
-    def read(self, size):
+    def _read(self, size):
         self._pos += size
         return self._stream.read(size)
 
+    def _pad(self, start, size=4):
+        offset = (self._pos - start) % size
+        if offset:
+            self._read(size - offset)
+
+    def read(self, size):
+        if self._padding:
+            self._pad(self._pad_start, size)
+        return self._read(size)
+
     def will_jump_to(self, size):
-        self._next_jump = (True, size)
+        self._next_jump = ('jump', (self._pos, size))
+        return self
+
+    def will_pad(self):
+        self._next_jump = ('pad', self._pos)
         return self
 
-    def will_pad(self, pad=4):
-        self._next_jump = (False, pad)
+    def padded_struct(self):
+        self._next_jump = ('padded', (self._padding, self._pad_start))
+        self._padding = True
+        self._pad_start = self._pos
         return self
 
     def __enter__(self):
-        (jump_type, size) = self._next_jump
-        self._jumps.append((self._pos, jump_type, size))
+        assert(self._next_jump)
+        self._jumps.append(self._next_jump)
+        self._next_jump = None
 
     def __exit__(self, exc_type, exc_value, traceback):
         if exc_type is None:
-            (start, jump_type, size) = self._jumps.pop()
-            if jump_type:
-                self.read(size - (self._pos - start))
-            else:
-                align = (self._pos - start) % size
-                if align:
-                    self.read(size - align)
+            (jump_type, data) = self._jumps.pop()
+            if jump_type == 'jump':
+                (start, size) = data
+                consummed = self._pos - start
+                if consummed > size:
+                    self.raise_error('Bad jump: too much read ({0} > {1})'.format(consummed, size))
+                self.read(size - consummed)
+            elif jump_type == 'pad':
+                self._pad(data)
+            elif jump_type == 'padded':
+                (prev_padding, prev_pad_start) = data
+                self._pad(self._pad_start)
+                self._padding = prev_padding
+                self._pad_start = prev_pad_start
 
     def unpacks(self, format, size):
         return struct.unpack(format, self.read(size))
@@ -148,8 +225,6 @@ def consume_GuidAndPicture(stream):
 def consume_CountOfBytesWithCompressionFlag(stream):
     # CountOfBytesWithCompressionFlag or CountOfCharsWithCompressionFlag: [MS-OFORMS] 2.4.14.2 or 2.4.14.3
     count = stream.unpack('<L', 4)
-    if not count & 0x80000000 and count != 0:
-        stream.aise_error('Uncompress string length', 4)
     return count & 0x7FFFFFFF
 
 def consume_SiteClassInfo(stream):
@@ -175,33 +250,27 @@ def consume_OleSiteConcreteControl(stream):
     with stream.will_jump_to(cbSite):
         propmask = SitePropMask(stream.unpack('<L', 4))
         # SiteDataBlock: [MS-OFORMS] 2.2.10.12.3
-        name_len = tag_len = id = 0
-        if propmask.fName:
-            name_len = consume_CountOfBytesWithCompressionFlag(stream)
-        if propmask.fTag:
-            tag_len = consume_CountOfBytesWithCompressionFlag(stream)
-        if propmask.fID:
-            id = stream.unpack('<L', 4)
-        for prop in ['fHelpContextID', 'fBitFlags', 'fObjectStreamSize']:
-            if propmask[prop]:
-                stream.read(4)
-        tabindex = ClsidCacheIndex = 0
-        with stream.will_pad():
+        with stream.padded_struct():
+            name_len = tag_len = id = 0
+            if propmask.fName:
+                name_len = consume_CountOfBytesWithCompressionFlag(stream)
+            if propmask.fTag:
+                tag_len = consume_CountOfBytesWithCompressionFlag(stream)
+            if propmask.fID:
+                id = stream.unpack('<L', 4)
+            propmask.consume(stream, [('fHelpContextID', 4), ('fBitFlags', 4), ('fObjectStreamSize', 4)])
+            tabindex = ClsidCacheIndex = 0
             if propmask.fTabIndex:
                 tabindex = stream.unpack('<H', 2)
             if propmask.fClsidCacheIndex:
                 ClsidCacheIndex = stream.unpack('<H', 2)
-            if propmask.fGroupID:
-                stream.read(2)
-        # For the next 4 entries, the documentation adds padding, but it should already be aligned??
-        for prop in ['fControlTipText', 'fRuntimeLicKey', 'fControlSource', 'fRowSource']:
-            if propmask[prop]:
-                stream.read(4)
+            propmask.consume(stream, [('fGroupID', 2), ('fControlTipText', 4), ('fRuntimeLicKey', 4),
+                                      ('fControlSource', 4), ('fRowSource', 4)])
         # SiteExtraDataBlock: [MS-OFORMS] 2.2.10.12.4
         name = stream.read(name_len)
         tag = stream.read(tag_len)
         return {'name': name, 'tag': tag, 'id': id, 'tabindex': tabindex,
-               'ClsidCacheIndex': ClsidCacheIndex}
+               'ClsidCacheIndex': ClsidCacheIndex, 'value': None}
 
 def consume_FormControl(stream):
     # FormControl: [MS-OFORMS] 2.2.10.1
@@ -210,9 +279,7 @@ def consume_FormControl(stream):
     with stream.will_jump_to(cbform):
         propmask = FormPropMask(stream.unpack('<L', 4))
         # FormDataBlock: [MS-OFORMS] 2.2.10.3
-        for prop in ['fBackColor', 'fForeColor', 'fNextAvailableID']:
-            if propmask[prop]:
-                stream.read(4)
+        propmask.consume(stream, [('fBackColor', 4), ('fForeColor', 4), ('fNextAvailableID', 4)])
         if propmask.fBooleanProperties:
             BooleanProperties = stream.unpack('<L', 4)
             FORM_FLAG_DONTSAVECLASSTABLE = (BooleanProperties & (1<<15)) >> 15
@@ -233,11 +300,12 @@ def consume_FormControl(stream):
             consume_SiteClassInfo(stream)
     (CountOfSites, CountOfBytes) = stream.unpacks('<LL', 8)
     remaining_SiteDepthsAndTypes = CountOfSites
-    with stream.will_pad():
-        while remaining_SiteDepthsAndTypes > 0:
-            remaining_SiteDepthsAndTypes -= consume_FormObjectDepthTypeCount(stream)
-    for i in range(CountOfSites):
-        yield consume_OleSiteConcreteControl(stream)
+    with stream.will_jump_to(CountOfBytes):
+        with stream.will_pad():
+            while remaining_SiteDepthsAndTypes > 0:
+                remaining_SiteDepthsAndTypes -= consume_FormObjectDepthTypeCount(stream)
+        for i in range(CountOfSites):
+            yield consume_OleSiteConcreteControl(stream)
 
 def consume_MorphDataControl(stream):
     # MorphDataControl: [MS-OFORMS] 2.2.5.1
@@ -246,36 +314,25 @@ def consume_MorphDataControl(stream):
     with stream.will_jump_to(cbMorphData):
         propmask = MorphDataPropMask(stream.unpack('<Q', 8))
         # MorphDataDataBlock: [MS-OFORMS] 2.2.5.3
-        for prop in ['fVariousPropertyBits', 'fBackColor', 'fForeColor', 'fMaxLength']:
-            if propmask[prop]:
-                stream.read(4)
-        with stream.will_pad():
-            for prop in ['fBorderStyle', 'fScrollBars', 'fDisplayStyle', 'fMousePointer']:
-                if propmask[prop]:
-                    stream.read(1)
-        # PasswordChar, BoundColumn, TextColumn, ColumnCount, and ListRows are 2B + pad = 4B
-        # ListWidth is 4B + pad = 4B
-        for prop in ['fPasswordChar', 'fListWidth', 'fBoundColumn', 'fTextColumn', 'fColumnCount',
-                     'fListRows']:
-            if propmask[prop]:
-                stream.read(4)
-        with stream.will_pad():
-            if propmask.fcColumnInfo:
-                stream.read(2)
-            for prop in ['fMatchEntry', 'fListStyle', 'fShowDropButtonWhen', 'fDropButtonStyle',
-                         'fMultiSelect']:
-                if propmask[prop]:
-                    stream.read(1)
-        if propmask.fValue:
-            value_size = consume_CountOfBytesWithCompressionFlag(stream)
-        else:
-            value_size = 0
-        # Caption, PicturePosition, BorderColor, SpecialEffect, GroupName  are 4B + pad = 4B
-        # MouseIcon, Picture, Accelerator are 2B + pad = 4B
-        for prop in ['fCaption', 'fPicturePosition', 'fBorderColor', 'fSpecialEffect',
-                     'fMouseIcon', 'fPicture', 'fAccelerator', 'fGroupName']:
-            if propmask[prop]:
-                stream.read(4)
+        with stream.padded_struct():
+            propmask.consume(stream, [('fVariousPropertyBits', 4), ('fBackColor', 4),
+                                      ('fForeColor', 4), ('fMaxLength', 4),
+                                      ('fBorderStyle', 1), ('fScrollBars', 1),
+                                      ('fDisplayStyle', 1), ('fMousePointer', 1),
+                                      ('fPasswordChar', 2), ('fListWidth', 4),
+                                      ('fBoundColumn', 2), ('fTextColumn', 2),
+                                      ('fColumnCount', 2), ('fListRows', 2),
+                                      ('fcColumnInfo', 2), ('fMatchEntry', 1),
+                                      ('fListStyle', 1), ('fShowDropButtonWhen', 1),
+                                      ('fDropButtonStyle', 1), ('fMultiSelect', 1)])
+            if propmask.fValue:
+                value_size = consume_CountOfBytesWithCompressionFlag(stream)
+            else:
+                value_size = 0
+            propmask.consume(stream, [('fCaption', 4), ('fPicturePosition', 4),
+                                      ('fBorderColor', 4), ('fSpecialEffect', 4),
+                                      ('fMouseIcon', 2), ('fPicture', 2),
+                                      ('fAccelerator', 2), ('fGroupName', 4)])
         # MorphDataExtraDataBlock: [MS-OFORMS] 2.2.5.4
         stream.read(8)
         value = stream.read(value_size)
@@ -287,17 +344,141 @@ def consume_MorphDataControl(stream):
     consume_TextProps(stream)
     return value
 
+def consume_ImageControl(stream):
+    # ImageControl: [MS-OFORMS] 2.2.3.1
+    stream.check_values('ImageControl (versions)', '<BB', 2, (0, 2))
+    cbImage = stream.unpack('<H', 2)
+    with stream.will_jump_to(cbImage):
+        propmask = ImagePropMask(stream.unpack('<L', 4))
+        # Skip the DataBlock and the ExtraDataBlock
+    # ImageStreamData: [MS-OFORMS] 2.2.3.5
+    if propmask.fPicture:
+        consume_GuidAndPicture(stream)
+    if propmask.fMouseIcon:
+        consume_GuidAndPicture(stream)
+
+def consume_CommandButtonControl(stream):
+    # CommandButtonControl: [MS-OFORMS] 2.2.1.1
+    stream.check_values('CommandButtonControl (versions)', '<BB', 2, (0, 2))
+    cbCommandButton = stream.unpack('<H', 2)
+    with stream.will_jump_to(cbCommandButton):
+        propmask = CommandButtonPropMask(stream.unpack('<L', 4))
+        # Skip the DataBlock and the ExtraDataBlock
+    # ImageStreamData: [MS-OFORMS] 2.2.1.5
+    if propmask.fPicture:
+        consume_GuidAndPicture(stream)
+    if propmask.fMouseIcon:
+        consume_GuidAndPicture(stream)
+    consume_TextProps(stream)
+
+def consume_SpinButtonControl(stream):
+    # SpinButtonControl: [MS-OFORMS] 2.2.8.1
+    stream.check_values('SpinButtonControl (versions)', '<BB', 2, (0, 2))
+    cbSpinButton = stream.unpack('<H', 2)
+    with stream.will_jump_to(cbSpinButton):
+         propmask = SpinButtonPropMask(stream.unpack('<L', 4))
+        # Skip the DataBlock and the ExtraDataBlock
+    # SpinButtonStreamData: [MS-OFORMS] 2.2.8.5
+    if propmask.fMouseIcon:
+        consume_GuidAndPicture(stream)
+
+def consume_TabStripControl(stream):
+    # TabStripControl: [MS-OFORMS] 2.2.9.1
+    stream.check_values('TabStripControl (versions)', '<BB', 2, (0, 2))
+    cbTabStrip = stream.unpack('<H', 2)
+    with stream.will_jump_to(cbTabStrip):
+        propmask = TabStripPropMask(stream.unpack('<L', 4))
+        # TabStripDataBlock: [MS-OFORMS] 2.2.9.3
+        propmask.consume(stream, [('fListIndex', 4), ('fBackColor', 4),
+                                  ('fForeColor', 4), ('fSize', 4),
+                                  ('fMousePointer', 1), ('fTabOrientation', 4),
+                                  ('fTabStyle', 4), ('fTabFixedWidth', 4),
+                                  ('fTabFixedHeight', 4), ('fTipStrings', 4),
+                                  ('fNames', 4), ('fVariousPropertyBits', 4),
+                                  ('fTabsAllocated', 4), ('fTags', 4)])
+        tabData = 0
+        if propmask['fTabData']:
+            tabData = stream.unpack('<L', 4)
+        # Skip the ExtraDataBlock
+    # TabStripStreamData: [MS-OFORMS] 2.2.9.5
+    if propmask.fMouseIcon:
+        consume_GuidAndPicture(stream)
+    # TextProps
+    consume_TextProps(stream)
+    # TabStripTabFlagData: [MS-OFORMS] 2.2.9.6
+    for i in range(tabData):
+         stream.read(4)
+
+def consume_LabelControl(stream):
+    # LabelControl: [MS-OFORMS] 2.2.4.1
+    stream.check_values('LabelControl (versions)', '<BB', 2, (0, 2))
+    cbLabel = stream.unpack('<H', 2)
+    with stream.will_jump_to(cbLabel):
+        propmask = LabelPropMask(stream.unpack('<L', 4))
+        # LabelDataBlock: [MS-OFORMS] 2.2.4.3
+        with stream.padded_struct():
+            propmask.consume(stream, [('fForeColor', 4), ('fBackColor', 4),
+                                      ('fVariousPropertyBits', 4)])
+            if propmask.fCaption:
+                caption_size = consume_CountOfBytesWithCompressionFlag(stream)
+            else:
+                caption_size = 0
+            propmask.consume(stream, [('fPicturePosition', 4), ('fMousePointer', 1),
+                                      ('fBorderColor', 4), ('fBorderStyle', 2),
+                                      ('fSpecialEffect', 2), ('fPicture', 2),
+                                      ('fAccelerator', 2), ('fMouseIcon', 2)])
+        # LabelExtraDataBlock: [MS-OFORMS] 2.2.4.4
+        caption = stream.read(caption_size)
+        stream.read(8)
+    # LabelStreamData: [MS-OFORMS] 2.2.4.5
+    if propmask.fPicture:
+        consume_GuidAndPicture(stream)
+    if propmask.fMouseIcon:
+        consume_GuidAndPicture(stream)
+    # TextProps
+    consume_TextProps(stream)
+    return caption
+
+def consume_ScrollBarControl(stream):
+    # ScrollBarControl: [MS-OFORMS] 2.2.7.1
+    stream.check_values('LabelControl (versions)', '<BB', 2, (0, 2))
+    cbScrollBar = stream.unpack('<H', 2)
+    with stream.will_jump_to(cbScrollBar):
+        propmask = ScrollBarPropMask(stream.unpack('<L', 4))
+        # Skip the DataBlock and the ExtraDataBlock
+    # ScrollBarStreamData: [MS-OFORMS] 2.2.7.5
+    if propmask.fMouseIcon:
+        consume_GuidAndPicture(stream)
+
 def extract_OleFormVariables(ole_file, stream_dir):
     control = ExtendedStream.open(ole_file, '/'.join(stream_dir + ['f']))
     variables = list(consume_FormControl(control))
     # print('/'.join(stream_dir + ['o']))
     data = ExtendedStream.open(ole_file, '/'.join(stream_dir + ['o']))
     for var in variables:
-        if var['ClsidCacheIndex'] != 23:
-            #raise OleFormParsingError('Unsupported stored type: {0}'.format(str(var['ClsidCacheIndex'])))
+        # See FormEmbeddedActiveXControlCached for type definition: [MS-OFORMS] 2.4.5
+        if var['ClsidCacheIndex'] == 7:
+            consume_FormControl(data)
+        elif var['ClsidCacheIndex'] == 12:
+            consume_ImageControl(data)
+        elif var['ClsidCacheIndex'] == 14:
+            consume_FormControl(data)
+        elif var['ClsidCacheIndex'] in [15, 23, 24, 25, 26, 27, 28]:
+            var['value'] = consume_MorphDataControl(data)
+        elif var['ClsidCacheIndex'] == 16:
+            consume_SpinButtonControl(data)
+        elif var['ClsidCacheIndex'] == 17:
+            consume_CommandButtonControl(data)
+        elif var['ClsidCacheIndex'] == 18:
+            consume_TabStripControl(data)
+        elif var['ClsidCacheIndex'] == 21:
+            consume_LabelControl(data)
+        elif var['ClsidCacheIndex'] == 47:
+            consume_ScrollBarControl(data)
+        elif var['ClsidCacheIndex'] == 57:
+            consume_FormControl(data)
+        else:
             # TODO: use logging instead of print
             print('ERROR: Unsupported stored type in user form: {0}'.format(str(var['ClsidCacheIndex'])))
-            var['value'] = None
-        else:
-            var['value'] = consume_MorphDataControl(data)
+            break
     return variables
diff --git a/tests/oleform/__init__.py b/tests/oleform/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/oleform/__init__.py
diff --git a/tests/oleform/test_basic.py b/tests/oleform/test_basic.py
new file mode 100644
index 0000000..a0d2795
--- /dev/null
+++ b/tests/oleform/test_basic.py
@@ -0,0 +1,33 @@
+""" Test oleform basic functionality """
+
+import unittest
+from os.path import join
+import sys
+
+# Directory with test data, independent of current working directory
+from tests.test_utils import DATA_BASE_DIR
+
+if sys.version_info[0] <= 2:
+    from oletools.olevba import VBA_Parser
+else:
+    from oletools.olevba3 import VBA_Parser
+
+SAMPLES = [('oleform-PR314.docm', [('word/vbaProject.bin', u'UserFormTEST1', {'name': 'Label1', 'value': None, 'tag': 'l\x18sdf', 'ClsidCacheIndex': 21, 'id': 1, 'tabindex': 0}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'TextBox1', 'value': 'heyhey', 'tag': '', 'ClsidCacheIndex': 23, 'id': 2, 'tabindex': 1}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'ComboBox1', 'value': 'none dd', 'tag': '', 'ClsidCacheIndex': 25, 'id': 3, 'tabindex': 2}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'CheckBox1', 'value': '1', 'tag': '', 'ClsidCacheIndex': 26, 'id': 5, 'tabindex': 4}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'OptionButton1', 'value': '0', 'tag': '', 'ClsidCacheIndex': 27, 'id': 6, 'tabindex': 5}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'ToggleButton1', 'value': '0', 'tag': '', 'ClsidCacheIndex': 28, 'id': 7, 'tabindex': 6}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'Frame1', 'value': None, 'tag': '', 'ClsidCacheIndex': 14, 'id': 8, 'tabindex': 7}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'TabStrip1', 'value': None, 'tag': '', 'ClsidCacheIndex': 18, 'id': 10, 'tabindex': 8}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'CommandButton1', 'value': None, 'tag': '', 'ClsidCacheIndex': 17, 'id': 9, 'tabindex': 9}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'MultiPage1', 'value': None, 'tag': '', 'ClsidCacheIndex': 57, 'id': 12, 'tabindex': 10}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'ScrollBar1', 'value': None, 'tag': '', 'ClsidCacheIndex': 47, 'id': 16, 'tabindex': 11}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'SpinButton1', 'value': None, 'tag': '', 'ClsidCacheIndex': 16, 'id': 17, 'tabindex': 12}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'Image1', 'value': None, 'tag': '', 'ClsidCacheIndex': 12, 'id': 18, 'tabindex': 13}), ('word/vbaProject.bin', u'UserFormTEST1', {'name': 'ListBox1', 'value': '', 'tag': '', 'ClsidCacheIndex': 24, 'id': 4, 'tabindex': 3}), ('word/vbaProject.bin', u'UserFormTEST1/i08', {'name': 'TextBox2', 'value': 'abcd', 'tag': '', 'ClsidCacheIndex': 23, 'id': 20, 'tabindex': 0}), ('word/vbaProject.bin', u'UserFormTEST1/i12', {'name': '', 'value': None, 'tag': '', 'ClsidCacheIndex': 18, 'id': 13, 'tabindex': 2}), ('word/vbaProject.bin', u'UserFormTEST1/i12', {'name': 'Page1', 'value': None, 'tag': '', 'ClsidCacheIndex': 7, 'id': 14, 'tabindex': 0}), ('word/vbaProject.bin', u'UserFormTEST1/i12', {'name': 'Page2', 'value': None, 'tag': '', 'ClsidCacheIndex': 7, 'id': 15, 'tabindex': 1}), ('word/vbaProject.bin', u'UserFormTEST1/i12/i14', {'name': 'TextBox3', 'value': 'last one', 'tag': '', 'ClsidCacheIndex': 23, 'id': 24, 'tabindex': 0}), ('word/vbaProject.bin', u'UserFormTest2', {'name': 'Label1', 'value': None, 'tag': '', 'ClsidCacheIndex': 21, 'id': 1, 'tabindex': 0}), ('word/vbaProject.bin', u'UserFormTest2', {'name': 'Label2', 'value': None, 'tag': '', 'ClsidCacheIndex': 21, 'id': 2, 'tabindex': 1}), ('word/vbaProject.bin', u'UserFormTest2', {'name': 'TextBox1', 'value': '&\xe9"\'', 'tag': '', 'ClsidCacheIndex': 23, 'id': 3, 'tabindex': 2})])]
+
+class TestOleForm(unittest.TestCase):
+
+    def test_samples(self):
+        if sys.version_info[0] > 2:
+             # Unfortunately, olevba3 doesn't have extract_form_strings_extended
+             return
+        for sample, expected_result in SAMPLES:
+            full_name = join(DATA_BASE_DIR, 'oleform', sample)
+            parser = VBA_Parser(full_name)
+            variables = list(parser.extract_form_strings_extended())
+            self.assertEqual(variables, expected_result)
+
+
+# just in case somebody calls this file as a script
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/test-data/oleform/oleform-PR314.docm b/tests/test-data/oleform/oleform-PR314.docm
new file mode 100755
index 0000000..bb2c0aa
--- /dev/null
+++ b/tests/test-data/oleform/oleform-PR314.docm