Merge pull request #309 from andvib/fix-i065-i066

ff: Fix server test function names