Merge pull request #175 from jpav/master

Fixes #173.
Merge pull request #176 from jpav/master

Fixes #166
Merged integration source folder with test source folder to get all
tests in one jar. Also got rid of TestUtil class since there should be
no reason to use the internal Manager instance of testing. Much of the
dependency framework tests are still commented out, as we can revisit
those once we address that feature fully.