upgrading express in test resources; allowing for plural resource folder names; cleaning up some test patching