cleaning up main lib code and adding two simple test clients