task: #3612411 Split a couple of methods out of ManageFieldsFunctionalTest and...
task: #3612411 Split a couple of methods out of ManageFieldsFunctionalTest and convert them to kernel tests
By: catch
By: smustgrave
By: mstrelan
(cherry picked from commit b65177d2)