Removed list from quadtest and set fields line by line with switch.