Server updates with updated tests
Continue working on Database tests