fixed scripts/tests making use of dynamic options