Remove mocks and call server directly to get markers

#41