Additional modularization, misc. resource test fixes. Updates to populate sql script from mainline.
Merge pull request #22 from RonPasquarelli/master

Additional modularization, misc. resource test fixes. Updates to populat...