Now using a common endpoint to serve resources.

Also, updated tests to make it work