moved tests under server