- Added simple integration test case
- Minor refactoring of function and file names