Fix refactoring missed pieces.
Fix the new test case's out file.
Square brackets around source field options are now mandatory.