Server: 50% UnitTest: 50%

Many bugs fixed (thanks UnitTests)