Fix Tests
Merge branch 'fix-preview-size'