Integration test

Fix #21
Fix #22
Fix #23
Fix #24
Fix #31 
@ldavidson 
Signed-off-by: Sheik Hassan <solergiga@yahoo.com>