Fixing unit tests' use of ESFs, including a bug introduced in the last merge
Merge pull request #27 from pfarner/Fixing-test-ESFs

Fixing unit tests' use of ESFs, including a bug introduced in the last merge