Add fields choice for tests