Added serverApi service and test