Minor updates.  Moved integration testing.