adding test, corrosponding bugs filed
server mapping