MB-146 #Added tests for servers