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

This moves all *.esf files from src/test/java to src/test/resources