Some changes in Server and testharness parts