Additional Fields tests cleanups