[Form] Improved shape test