Adding server changes, fixing tests, removed obsolete tests