Updating tests for the move to ServerScanner