Removed server side codes and fixed unit tests