Removed extra print from test-case
Refactored client helper functions into classes in crypto package