wrap up dynamic fields implementation and tests