Refactor tests to better align fieldlist and field tests