[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2711: Added tests to cover more server code