server changes
moved tests