[US4394] Finished work on server and integration tests