Unit test bug fixes and etl refactoring
Merge pull request #45 from abouffard/master

Unit test bug fixes and etl refactoring