Changed order of theme cascading for testConstructorFallbackPathMerge().  More tests need to be looked at.
Changed testLocateWithOverriddenPathPattern() to expect the theme cascade order to have the user-config stacked up on top of the defaults rather than stacked up under them.  Also added templates into resources to be found by changes to the test.