Fix CommonTest