ServerController minor update.
Tests update.