close #15 Format json response and handle client side
Fix failling tests