Further development
Added new integration tests and refactored
Corrected namespace