Fixed a bug where the class control-label was not being added unles our form was horizontal style. Not having this class present causes label text to not be colored correctly should there be an error (stays black even though the field border is red). Update tests to reflect new markup generated.