fixed quite all the UTs; missing the required/unexpected check for fields