Add new sizes
Add new sizes and fix some tests