Fixes test and exposes Server endpoint