diff --git a/packages/sn-controls-react/src/fieldcontrols/date-picker.tsx b/packages/sn-controls-react/src/fieldcontrols/date-picker.tsx
index 790a24593..26dee7038 100644
--- a/packages/sn-controls-react/src/fieldcontrols/date-picker.tsx
+++ b/packages/sn-controls-react/src/fieldcontrols/date-picker.tsx
@@ -95,7 +95,6 @@ export const DatePicker: React.FC<ReactClientFieldSetting<DateTimeFieldSetting>>
                 label={settings.DisplayName}
                 id={settings.Name}
                 disabled={settings.ReadOnly}
-                // placeholder={settings.DisplayName}
                 InputLabelProps={{ shrink: true }}
                 required={settings.Compulsory}
                 format="yyyy MMMM dd"
diff --git a/packages/sn-controls-react/test/__snapshots__/date-picker.test.tsx.snap b/packages/sn-controls-react/test/__snapshots__/date-picker.test.tsx.snap
index e025e8724..52bb97b91 100644
--- a/packages/sn-controls-react/test/__snapshots__/date-picker.test.tsx.snap
+++ b/packages/sn-controls-react/test/__snapshots__/date-picker.test.tsx.snap
@@ -26,11 +26,15 @@ exports[`Date/Date time field control in edit/new view should set all the props
   utils={[Function]}
 >
   <PickerWithState
+    InputLabelProps={
+      Object {
+        "shrink": true,
+      }
+    }
     allowKeyboardControl={true}
     ampm={true}
     disabled={true}
     format="yyyy MMMM dd hh:mm aaaa"
-    fullWidth={true}
     id="ModificationDate"
     invalidDateMessage="Invalid Date Format"
     label="Modification Date"
@@ -42,7 +46,6 @@ exports[`Date/Date time field control in edit/new view should set all the props
     onChange={[Function]}
     openTo="date"
     orientation="portrait"
-    placeholder="Modification Date"
     required={true}
     showTabs={true}
     value="1912-04-15T02:10:00.000Z"
@@ -67,10 +70,14 @@ exports[`Date/Date time field control in edit/new view should set all the props
   utils={[Function]}
 >
   <PickerWithState
+    InputLabelProps={
+      Object {
+        "shrink": true,
+      }
+    }
     allowKeyboardControl={true}
     disabled={true}
     format="yyyy MMMM dd"
-    fullWidth={true}
     id="ModificationDate"
     invalidDateMessage="Invalid Date Format"
     label="Modification Date"
@@ -81,7 +88,6 @@ exports[`Date/Date time field control in edit/new view should set all the props
     name="ModificationDate"
     onChange={[Function]}
     openTo="date"
-    placeholder="Modification Date"
     required={true}
     value="1912-04-15T02:10:00.000Z"
     views={
diff --git a/packages/sn-controls-react/test/__snapshots__/dropdown-list.test.tsx.snap b/packages/sn-controls-react/test/__snapshots__/dropdown-list.test.tsx.snap
index 85c32d792..726e68549 100644
--- a/packages/sn-controls-react/test/__snapshots__/dropdown-list.test.tsx.snap
+++ b/packages/sn-controls-react/test/__snapshots__/dropdown-list.test.tsx.snap
@@ -3,8 +3,12 @@
 exports[`Drop down list field control in edit/new view should set all the props 1`] = `
 <WithStyles(ForwardRef(FormControl))
   disabled={true}
-  fullWidth={true}
   required={true}
+  style={
+    Object {
+      "minWidth": "220px",
+    }
+  }
 >
   <WithStyles(ForwardRef(InputLabel))
     htmlFor="VersioningMode"
diff --git a/packages/sn-controls-react/test/__snapshots__/number.test.tsx.snap b/packages/sn-controls-react/test/__snapshots__/number.test.tsx.snap
index 2655c48b2..704371c51 100644
--- a/packages/sn-controls-react/test/__snapshots__/number.test.tsx.snap
+++ b/packages/sn-controls-react/test/__snapshots__/number.test.tsx.snap
@@ -20,6 +20,11 @@ exports[`Number field control in browse view should show the displayname and fie
 exports[`Number field control in edit/new view should set all the props 1`] = `
 <Fragment>
   <WithStyles(ForwardRef(TextField))
+    InputLabelProps={
+      Object {
+        "shrink": true,
+      }
+    }
     InputProps={
       Object {
         "endAdornment": <WithStyles(ForwardRef(InputAdornment))
@@ -35,7 +40,6 @@ exports[`Number field control in edit/new view should set all the props 1`] = `
       }
     }
     disabled={true}
-    fullWidth={true}
     id="Index"
     inputProps={
       Object {
@@ -47,7 +51,7 @@ exports[`Number field control in edit/new view should set all the props 1`] = `
     label="Index"
     name="Index"
     onChange={[Function]}
-    placeholder="Index"
+    placeholder="0"
     required={true}
     type="number"
     value={7}
diff --git a/packages/sn-controls-react/test/__snapshots__/short-text.test.tsx.snap b/packages/sn-controls-react/test/__snapshots__/short-text.test.tsx.snap
index 7f385201b..496e32157 100644
--- a/packages/sn-controls-react/test/__snapshots__/short-text.test.tsx.snap
+++ b/packages/sn-controls-react/test/__snapshots__/short-text.test.tsx.snap
@@ -20,6 +20,11 @@ exports[`Short text field control in browse view should show the displayname and
 exports[`Short text field control in edit/new view should set all the props 1`] = `
 <Fragment>
   <WithStyles(ForwardRef(TextField))
+    InputLabelProps={
+      Object {
+        "shrink": true,
+      }
+    }
     autoComplete="off"
     disabled={true}
     fullWidth={true}
@@ -34,7 +39,6 @@ exports[`Short text field control in edit/new view should set all the props 1`]
     label="Display name"
     name="DisplayName"
     onChange={[Function]}
-    placeholder="Display name"
     required={true}
     value="Hello World"
   />
diff --git a/packages/sn-controls-react/test/date-picker.test.tsx b/packages/sn-controls-react/test/date-picker.test.tsx
index 49dad0f6c..babb5b074 100644
--- a/packages/sn-controls-react/test/date-picker.test.tsx
+++ b/packages/sn-controls-react/test/date-picker.test.tsx
@@ -71,7 +71,6 @@ describe('Date/Date time field control', () => {
       expect(wrapper.find(DateTimePicker).prop('name')).toBe(defaultSettings.Name)
       expect(wrapper.find(DateTimePicker).prop('id')).toBe(defaultSettings.Name)
       expect(wrapper.find(DateTimePicker).prop('label')).toBe(defaultSettings.DisplayName)
-      expect(wrapper.find(DateTimePicker).prop('placeholder')).toBe(defaultSettings.DisplayName)
       expect(wrapper.find(DateTimePicker).prop('required')).toBeTruthy()
       expect(wrapper.find(DateTimePicker).prop('disabled')).toBeTruthy()
       expect(wrapper).toMatchSnapshot()
@@ -109,7 +108,6 @@ describe('Date/Date time field control', () => {
       expect(wrapper.find(MUIDatePicker).prop('name')).toBe(defaultSettings.Name)
       expect(wrapper.find(MUIDatePicker).prop('id')).toBe(defaultSettings.Name)
       expect(wrapper.find(MUIDatePicker).prop('label')).toBe(defaultSettings.DisplayName)
-      expect(wrapper.find(MUIDatePicker).prop('placeholder')).toBe(defaultSettings.DisplayName)
       expect(wrapper.find(MUIDatePicker).prop('required')).toBeTruthy()
       expect(wrapper.find(MUIDatePicker).prop('disabled')).toBeTruthy()
       expect(wrapper).toMatchSnapshot()
diff --git a/packages/sn-controls-react/test/number.test.tsx b/packages/sn-controls-react/test/number.test.tsx
index dacd8a111..7f8d35ccf 100644
--- a/packages/sn-controls-react/test/number.test.tsx
+++ b/packages/sn-controls-react/test/number.test.tsx
@@ -75,7 +75,7 @@ describe('Number field control', () => {
       expect(wrapper.find(TextField).prop('name')).toBe(defaultSettings.Name)
       expect(wrapper.find(TextField).prop('id')).toBe(defaultSettings.Name)
       expect(wrapper.find(TextField).prop('label')).toBe(defaultSettings.DisplayName)
-      expect(wrapper.find(TextField).prop('placeholder')).toBe(defaultSettings.DisplayName)
+      expect(wrapper.find(TextField).prop('placeholder')).toBe('0')
       expect(wrapper.find(TextField).prop('required')).toBeTruthy()
       expect(wrapper.find(TextField).prop('disabled')).toBeTruthy()
       expect(wrapper.find(FormHelperText).text()).toBe(defaultSettings.Description)
diff --git a/packages/sn-controls-react/test/reference-grid.test.tsx b/packages/sn-controls-react/test/reference-grid.test.tsx
index 2b5f12725..e7068ed77 100644
--- a/packages/sn-controls-react/test/reference-grid.test.tsx
+++ b/packages/sn-controls-react/test/reference-grid.test.tsx
@@ -83,12 +83,16 @@ describe('Reference grid field control', () => {
   describe('in browse view', () => {
     it('should show no value message when field value is not provided', () => {
       const wrapper = shallow(<ReferenceGrid actionName="browse" settings={defaultSettings} />)
-      expect(wrapper.find(Typography).text()).toBe(defaultLocalization.referenceGrid.noValue)
+      expect(wrapper.find(Typography).filter({ variant: 'body1' }).text()).toBe(
+        defaultLocalization.referenceGrid.noValue,
+      )
     })
 
     it('should show no value message when field value is empty array', () => {
       const wrapper = shallow(<ReferenceGrid actionName="browse" settings={defaultSettings} fieldValue={[] as any} />)
-      expect(wrapper.find(Typography).text()).toBe(defaultLocalization.referenceGrid.noValue)
+      expect(wrapper.find(Typography).filter({ variant: 'body1' }).text()).toBe(
+        defaultLocalization.referenceGrid.noValue,
+      )
     })
 
     it('should render the default item template when there is a field value', async () => {
@@ -102,7 +106,7 @@ describe('Reference grid field control', () => {
       })
 
       expect(wrapper.find(DefaultItemTemplate)).toHaveLength(1)
-      expect(wrapper.find(InputLabel).text()).toBe(defaultSettings.DisplayName)
+      expect(wrapper.find(Typography).filter({ variant: 'caption' }).text()).toBe(defaultSettings.DisplayName)
     })
 
     it('should create an allowed type list filter', async () => {
diff --git a/packages/sn-controls-react/test/short-text.test.tsx b/packages/sn-controls-react/test/short-text.test.tsx
index 32a7f8138..cbed3068a 100644
--- a/packages/sn-controls-react/test/short-text.test.tsx
+++ b/packages/sn-controls-react/test/short-text.test.tsx
@@ -53,7 +53,6 @@ describe('Short text field control', () => {
       expect(wrapper.find(TextField).prop('name')).toBe(defaultSettings.Name)
       expect(wrapper.find(TextField).prop('id')).toBe(defaultSettings.Name)
       expect(wrapper.find(TextField).prop('label')).toBe(defaultSettings.DisplayName)
-      expect(wrapper.find(TextField).prop('placeholder')).toBe(defaultSettings.DisplayName)
       expect(wrapper.find(TextField).prop('required')).toBeTruthy()
       expect(wrapper.find(TextField).prop('disabled')).toBeTruthy()
       expect(wrapper.find(FormHelperText).text()).toEqual('description')