Server Tests and some changes