refinement on urls and draft of unit test