web -> server rename
updated tests